diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml index f1aecb91fb..509d0c4380 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-paint-staking: &test-paint-staking +test-palette-staking: &test-palette-staking stage: test <<: *docker-env variables: @@ -167,7 +167,7 @@ test-paint-staking: &test-paint-staking variables: - $DEPLOY_TAG script: - - cd paint/staking/ + - cd palette/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 b4477dab53..690a0ac7cc 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 `paint`. -# Such rule is just: `client(client: Arc, pool: Arc>) -> jsonrpc_core::IoHa C: ProvideRuntimeApi, C: client::blockchain::HeaderBackend, C: Send + Sync + 'static, - C::Api: paint_system_rpc::AccountNonceApi, - C::Api: paint_contracts_rpc::ContractsRuntimeApi, - C::Api: paint_transaction_payment_rpc::TransactionPaymentRuntimeApi, + C::Api: palette_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 paint_system_rpc::{System, SystemApi}; - use paint_contracts_rpc::{Contracts, ContractsApi}; - use paint_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; + use palette_system_rpc::{System, SystemApi}; + use pallet_contracts_rpc::{Contracts, ContractsApi}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; let mut io = jsonrpc_core::IoHandler::default(); io.extend_with( diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml index 2cc7f84e85..fd2ef694e6 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 } -# paint dependencies -authority-discovery = { package = "paint-authority-discovery", path = "../../../paint/authority-discovery", default-features = false } -authorship = { package = "paint-authorship", path = "../../../paint/authorship", default-features = false } -babe = { package = "paint-babe", path = "../../../paint/babe", default-features = false } -balances = { package = "paint-balances", path = "../../../paint/balances", default-features = false } -collective = { package = "paint-collective", path = "../../../paint/collective", default-features = false } -contracts = { package = "paint-contracts", path = "../../../paint/contracts", default-features = false } -contracts-rpc-runtime-api = { package = "paint-contracts-rpc-runtime-api", path = "../../../paint/contracts/rpc/runtime-api/", default-features = false } -democracy = { package = "paint-democracy", path = "../../../paint/democracy", default-features = false } -elections-phragmen = { package = "paint-elections-phragmen", path = "../../../paint/elections-phragmen", default-features = false } -executive = { package = "paint-executive", path = "../../../paint/executive", default-features = false } -finality-tracker = { package = "paint-finality-tracker", path = "../../../paint/finality-tracker", default-features = false } -grandpa = { package = "paint-grandpa", path = "../../../paint/grandpa", default-features = false } -im-online = { package = "paint-im-online", path = "../../../paint/im-online", default-features = false } -indices = { package = "paint-indices", path = "../../../paint/indices", default-features = false } -membership = { package = "paint-membership", path = "../../../paint/membership", default-features = false } -nicks = { package = "paint-nicks", path = "../../../paint/nicks", default-features = false } -offences = { package = "paint-offences", path = "../../../paint/offences", default-features = false } -randomness-collective-flip = { package = "paint-randomness-collective-flip", path = "../../../paint/randomness-collective-flip", default-features = false } -session = { package = "paint-session", path = "../../../paint/session", default-features = false, features = ["historical"] } -staking = { package = "paint-staking", path = "../../../paint/staking", default-features = false } -paint-staking-reward-curve = { path = "../../../paint/staking/reward-curve"} -sudo = { package = "paint-sudo", path = "../../../paint/sudo", default-features = false } -support = { package = "paint-support", path = "../../../paint/support", default-features = false } -system = { package = "paint-system", path = "../../../paint/system", default-features = false } -system-rpc-runtime-api = { package = "paint-system-rpc-runtime-api", path = "../../../paint/system/rpc/runtime-api/", default-features = false } -timestamp = { package = "paint-timestamp", path = "../../../paint/timestamp", default-features = false } -treasury = { package = "paint-treasury", path = "../../../paint/treasury", default-features = false } -utility = { package = "paint-utility", path = "../../../paint/utility", default-features = false } -transaction-payment = { package = "paint-transaction-payment", path = "../../../paint/transaction-payment", default-features = false } -transaction-payment-rpc-runtime-api = { package = "paint-transaction-payment-rpc-runtime-api", path = "../../../paint/transaction-payment/rpc/runtime-api/", 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 } [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/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs index dd3addf64d..7018ed10ec 100644 --- a/substrate/bin/node/runtime/src/lib.rs +++ b/substrate/bin/node/runtime/src/lib.rs @@ -78,7 +78,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. spec_version: 194, - impl_version: 195, + impl_version: 196, apis: RUNTIME_API_VERSIONS, }; @@ -235,7 +235,7 @@ impl session::historical::Trait for Runtime { type FullIdentificationOf = staking::ExposureOf; } -paint_staking_reward_curve::build! { +pallet_staking_reward_curve::build! { const REWARD_CURVE: PiecewiseLinear<'static> = curve!( min_inflation: 0_025_000, max_inflation: 0_100_000, diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml index 1f585c19a9..18e735d946 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 = "paint-balances", path = "../../../paint/balances" } +balances = { package = "pallet-balances", path = "../../../palette/balances" } client = { package = "substrate-client", path = "../../../client/" } codec = { package = "parity-scale-codec", version = "1.0.0" } -contracts = { package = "paint-contracts", path = "../../../paint/contracts" } -grandpa = { package = "paint-grandpa", path = "../../../paint/grandpa" } -indices = { package = "paint-indices", path = "../../../paint/indices" } +contracts = { package = "pallet-contracts", path = "../../../palette/contracts" } +grandpa = { package = "pallet-grandpa", path = "../../../palette/grandpa" } +indices = { package = "pallet-indices", path = "../../../palette/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 = "paint-support", path = "../../../paint/support" } -session = { package = "paint-session", path = "../../../paint/session" } +runtime_support = { package = "palette-support", path = "../../../palette/support" } +session = { package = "pallet-session", path = "../../../palette/session" } sr-primitives = { path = "../../../primitives/sr-primitives" } -staking = { package = "paint-staking", path = "../../../paint/staking" } +staking = { package = "pallet-staking", path = "../../../palette/staking" } substrate-executor = { path = "../../../client/executor" } -system = { package = "paint-system", path = "../../../paint/system" } +system = { package = "palette-system", path = "../../../palette/system" } test-client = { package = "substrate-test-client", path = "../../../test/utils/client" } -timestamp = { package = "paint-timestamp", path = "../../../paint/timestamp" } -transaction-payment = { package = "paint-transaction-payment", path = "../../../paint/transaction-payment" } -treasury = { package = "paint-treasury", path = "../../../paint/treasury" } +timestamp = { package = "pallet-timestamp", path = "../../../palette/timestamp" } +transaction-payment = { package = "pallet-transaction-payment", path = "../../../palette/transaction-payment" } +treasury = { package = "pallet-treasury", path = "../../../palette/treasury" } wabt = "0.9.2" diff --git a/substrate/bin/subkey/Cargo.toml b/substrate/bin/subkey/Cargo.toml index 2a3a8318c9..9e31865692 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 = "paint-system", path = "../../paint/system" } -balances = { package = "paint-balances", path = "../../paint/balances" } -transaction-payment = { package = "paint-transaction-payment", path = "../../paint/transaction-payment" } +system = { package = "palette-system", path = "../../palette/system" } +balances = { package = "pallet-balances", path = "../../palette/balances" } +transaction-payment = { package = "pallet-transaction-payment", path = "../../palette/transaction-payment" } [features] bench = [] diff --git a/substrate/docs/CODEOWNERS b/substrate/docs/CODEOWNERS index 5a6eec3275..eeda13a0f0 100644 --- a/substrate/docs/CODEOWNERS +++ b/substrate/docs/CODEOWNERS @@ -40,22 +40,22 @@ /primitives/rpc/ @tomusdrw # GRANDPA, BABE, consensus stuff -/paint/babe/ @andresilva @DemiMarie-parity -/paint/grandpa/ @andresilva @DemiMarie-parity +/palette/babe/ @andresilva @DemiMarie-parity +/palette/grandpa/ @andresilva @DemiMarie-parity /client/finality-grandpa/ @andresilva @DemiMarie-parity /client/consensus/babe/ @andresilva @DemiMarie-parity /client/consensus/slots/ @andresilva @DemiMarie-parity # Contracts -/paint/contracts/ @pepyakin @thiolliere @jimpo -/paint/contracts/src/wasm/runtime.rs @Robbepop +/palette/contracts/ @pepyakin @thiolliere @jimpo +/palette/contracts/src/wasm/runtime.rs @Robbepop # Inflation points -/paint/staking/src/inflation.rs @thiolliere +/palette/staking/src/inflation.rs @thiolliere # NPoS and Governance -/paint/staking/ @kianenigma -/paint/election/ @kianenigma +/palette/staking/ @kianenigma +/palette/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 -/paint/support/ @thiolliere @kianenigma +/palette/support/ @thiolliere @kianenigma diff --git a/substrate/docs/README.adoc b/substrate/docs/README.adoc index 05eb7e3f81..9c33d28913 100644 --- a/substrate/docs/README.adoc +++ b/substrate/docs/README.adoc @@ -272,7 +272,7 @@ You can run all the tests if you like: [source, shell] cargo test --all -Or just run the tests of a specific package (i.e. `cargo test -p paint-assets`) +Or just run the tests of a specific package (i.e. `cargo test -p pallet-assets`) You can start a development chain with: @@ -446,9 +446,9 @@ substrate-trie sr-api, sr-io, sr-primitives, sr-sandbox, sr-std, sr-version * Substrate Runtime Module Library (SRML) [source, shell] -paint-assets, paint-balances, paint-consensus, paint-contracts, paint-council, paint-democracy, paint-example, -paint-executive, paint-metadata, paint-session, paint-staking, paint-support, paint-system, paint-timestamp, -paint-treasury +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 * 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 874ef6dd23..bcd2f32d8f 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 -* PAINT (formerly `srml`) +* PALETTE (formerly `srml`) Putting all these components together we have: @@ -35,21 +35,31 @@ 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 `paint-`-crates +** crates may not (dev-)depend on any `palette-`-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. -=== PAINT (formerly `srml`) +=== PALETTE (formerly `srml`) -* _found in_: `/paint` -* _crates prefix_: `paint-` +* _found in_: `/palette` +* _crates prefix_: `palette-` and `pallet-` * _constraints_: -** all crates that go on chain, must be `[no_std]` +** all crates that go on chain must be `[no_std]` ** must not (dev-)depend on anything in `/client` -PAINT, the Parity Application Interface for Network-wide Transitions, is a set of modules implementing specific transition functions and features one (might) want to have in their runtime. +PALETTE is a set of modules that implement specific transition functions and features one might want to have in their runtime. -=== integration tests +_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. + +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: + +- Executive +- Metadata +- Support +- System +- Utility + +=== Integration Tests * _found in_: `/test` * _crates prefix_: `substrate-test` @@ -69,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 paint-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 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`. ==== Node Template @@ -89,7 +99,7 @@ Subkey is a client library to generate keys and sign transactions to send to a s .... +---------------+ +----------------+ | | | | -| runtime +<------+ paint | +| runtime +<------+ palette | | | | | +------+-----+--+ +-------------+--+ ^ ^ ^ diff --git a/substrate/paint/assets/Cargo.toml b/substrate/palette/assets/Cargo.toml similarity index 81% rename from substrate/paint/assets/Cargo.toml rename to substrate/palette/assets/Cargo.toml index d8fa259484..9872334a63 100644 --- a/substrate/paint/assets/Cargo.toml +++ b/substrate/palette/assets/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-assets" +name = "pallet-assets" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -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 = "paint-support", path = "../support", default-features = false } +support = { package = "palette-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 = "paint-system", path = "../system", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../primitives/core" } diff --git a/substrate/paint/assets/src/lib.rs b/substrate/palette/assets/src/lib.rs similarity index 99% rename from substrate/paint/assets/src/lib.rs rename to substrate/palette/assets/src/lib.rs index 4f91cd1919..6739c97340 100644 --- a/substrate/paint/assets/src/lib.rs +++ b/substrate/palette/assets/src/lib.rs @@ -124,8 +124,8 @@ //! //! ## Related Modules //! -//! * [`System`](../paint_system/index.html) -//! * [`Support`](../paint_support/index.html) +//! * [`System`](../palette_system/index.html) +//! * [`Support`](../palette_support/index.html) // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] diff --git a/substrate/paint/aura/Cargo.toml b/substrate/palette/aura/Cargo.toml similarity index 77% rename from substrate/paint/aura/Cargo.toml rename to substrate/palette/aura/Cargo.toml index 7260d0d59f..f047762153 100644 --- a/substrate/paint/aura/Cargo.toml +++ b/substrate/palette/aura/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-aura" +name = "pallet-aura" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,14 +11,14 @@ inherents = { package = "substrate-inherents", path = "../../primitives/inherent primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } -session = { package = "paint-session", path = "../session", default-features = false } +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 = "paint-support", path = "../support", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } substrate-consensus-aura-primitives = { path = "../../primitives/consensus/aura", default-features = false} -system = { package = "paint-system", path = "../system", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } sp-timestamp = { package = "sp-timestamp", path = "../../primitives/timestamp", default-features = false } -paint-timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false } +pallet-timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } [dev-dependencies] @@ -40,5 +40,5 @@ std = [ "substrate-consensus-aura-primitives/std", "system/std", "sp-timestamp/std", - "paint-timestamp/std", + "pallet-timestamp/std", ] diff --git a/substrate/paint/aura/src/lib.rs b/substrate/palette/aura/src/lib.rs similarity index 93% rename from substrate/paint/aura/src/lib.rs rename to substrate/palette/aura/src/lib.rs index 0908cb7582..50ed4b0ab4 100644 --- a/substrate/paint/aura/src/lib.rs +++ b/substrate/palette/aura/src/lib.rs @@ -31,9 +31,9 @@ //! //! ## Related Modules //! -//! - [Timestamp](../paint_timestamp/index.html): The Timestamp module is used in Aura to track +//! - [Timestamp](../pallet_timestamp/index.html): The Timestamp module is used in Aura to track //! consensus rounds (via `slots`). -//! - [Consensus](../paint_consensus/index.html): The Consensus module does not relate directly to Aura, +//! - [Consensus](../palette_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 @@ -45,7 +45,7 @@ #![cfg_attr(not(feature = "std"), no_std)] -use paint_timestamp; +use pallet_timestamp; use rstd::{result, prelude::*}; use codec::{Encode, Decode}; @@ -67,7 +67,7 @@ use substrate_consensus_aura_primitives::{ mod mock; mod tests; -pub trait Trait: paint_timestamp::Trait { +pub trait Trait: pallet_timestamp::Trait { /// The identifier type for an authority. type AuthorityId: Member + Parameter + RuntimeAppPublic + Default; } @@ -176,7 +176,7 @@ impl Module { pub fn slot_duration() -> T::Moment { // we double the minimum block-period so each author can always propose within // the majority of its slot. - ::MinimumPeriod::get().saturating_mul(2.into()) + ::MinimumPeriod::get().saturating_mul(2.into()) } fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) { @@ -205,7 +205,7 @@ impl OnTimestampSet for Module { } impl ProvideInherent for Module { - type Call = paint_timestamp::Call; + type Call = pallet_timestamp::Call; type Error = MakeFatalError; const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER; @@ -216,7 +216,7 @@ impl ProvideInherent for Module { /// Verify the validity of the inherent using the timestamp. fn check_inherent(call: &Self::Call, data: &InherentData) -> result::Result<(), Self::Error> { let timestamp = match call { - paint_timestamp::Call::set(ref timestamp) => timestamp.clone(), + pallet_timestamp::Call::set(ref timestamp) => timestamp.clone(), _ => return Ok(()), }; diff --git a/substrate/paint/aura/src/mock.rs b/substrate/palette/aura/src/mock.rs similarity index 98% rename from substrate/paint/aura/src/mock.rs rename to substrate/palette/aura/src/mock.rs index 82a16335da..f476fd1826 100644 --- a/substrate/paint/aura/src/mock.rs +++ b/substrate/palette/aura/src/mock.rs @@ -62,7 +62,7 @@ impl system::Trait for Test { type Version = (); } -impl paint_timestamp::Trait for Test { +impl pallet_timestamp::Trait for Test { type Moment = u64; type OnTimestampSet = Aura; type MinimumPeriod = MinimumPeriod; diff --git a/substrate/paint/aura/src/tests.rs b/substrate/palette/aura/src/tests.rs similarity index 100% rename from substrate/paint/aura/src/tests.rs rename to substrate/palette/aura/src/tests.rs diff --git a/substrate/paint/authority-discovery/Cargo.toml b/substrate/palette/authority-discovery/Cargo.toml similarity index 79% rename from substrate/paint/authority-discovery/Cargo.toml rename to substrate/palette/authority-discovery/Cargo.toml index 311101e5a8..4c367a42b4 100644 --- a/substrate/paint/authority-discovery/Cargo.toml +++ b/substrate/palette/authority-discovery/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-authority-discovery" +name = "pallet-authority-discovery" version = "0.1.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,10 +12,10 @@ primitives = { package = "substrate-primitives", path = "../../primitives/core" rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } serde = { version = "1.0.101", optional = true } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } -session = { package = "paint-session", path = "../session", default-features = false, features = [ "historical" ] } +session = { package = "pallet-session", path = "../session", default-features = false, features = [ "historical" ] } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] sr-staking-primitives = { path = "../../primitives/sr-staking-primitives", default-features = false } diff --git a/substrate/paint/authority-discovery/src/lib.rs b/substrate/palette/authority-discovery/src/lib.rs similarity index 100% rename from substrate/paint/authority-discovery/src/lib.rs rename to substrate/palette/authority-discovery/src/lib.rs diff --git a/substrate/paint/authorship/Cargo.toml b/substrate/palette/authorship/Cargo.toml similarity index 84% rename from substrate/paint/authorship/Cargo.toml rename to substrate/palette/authorship/Cargo.toml index e360ca1e2f..1a1731f950 100644 --- a/substrate/paint/authorship/Cargo.toml +++ b/substrate/palette/authorship/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-authorship" +name = "pallet-authorship" version = "0.1.0" description = "Block and Uncle Author tracking for the SRML" authors = ["Parity Technologies "] @@ -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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-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/paint/authorship/src/lib.rs b/substrate/palette/authorship/src/lib.rs similarity index 100% rename from substrate/paint/authorship/src/lib.rs rename to substrate/palette/authorship/src/lib.rs diff --git a/substrate/paint/babe/Cargo.toml b/substrate/palette/babe/Cargo.toml similarity index 80% rename from substrate/paint/babe/Cargo.toml rename to substrate/palette/babe/Cargo.toml index 549cc44851..c6f224ec47 100644 --- a/substrate/paint/babe/Cargo.toml +++ b/substrate/palette/babe/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-babe" +name = "pallet-babe" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,11 +12,11 @@ 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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } -timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-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 = "paint-session", path = "../session", default-features = false } +session = { package = "pallet-session", path = "../session", default-features = false } babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../primitives/consensus/babe", default-features = false } runtime-io ={ package = "sr-io", path = "../../primitives/sr-io", default-features = false } diff --git a/substrate/paint/babe/src/lib.rs b/substrate/palette/babe/src/lib.rs similarity index 99% rename from substrate/paint/babe/src/lib.rs rename to substrate/palette/babe/src/lib.rs index 05cbcd0567..d0585b340f 100644 --- a/substrate/paint/babe/src/lib.rs +++ b/substrate/palette/babe/src/lib.rs @@ -74,7 +74,7 @@ pub trait EpochChangeTrigger { } /// A type signifying to BABE that an external trigger -/// for epoch changes (e.g. paint-session) is used. +/// for epoch changes (e.g. pallet-session) is used. pub struct ExternalTrigger; impl EpochChangeTrigger for ExternalTrigger { @@ -316,7 +316,7 @@ impl Module { /// and the caller is the only caller of this function. /// /// Typically, this is not handled directly by the user, but by higher-level validator-set manager logic like - /// `paint-session`. + /// `pallet-session`. pub fn enact_epoch_change( authorities: Vec<(AuthorityId, BabeAuthorityWeight)>, next_authorities: Vec<(AuthorityId, BabeAuthorityWeight)>, diff --git a/substrate/paint/babe/src/mock.rs b/substrate/palette/babe/src/mock.rs similarity index 100% rename from substrate/paint/babe/src/mock.rs rename to substrate/palette/babe/src/mock.rs diff --git a/substrate/paint/babe/src/tests.rs b/substrate/palette/babe/src/tests.rs similarity index 100% rename from substrate/paint/babe/src/tests.rs rename to substrate/palette/babe/src/tests.rs diff --git a/substrate/paint/balances/Cargo.toml b/substrate/palette/balances/Cargo.toml similarity index 75% rename from substrate/paint/balances/Cargo.toml rename to substrate/palette/balances/Cargo.toml index be00ed30c7..d1ba585293 100644 --- a/substrate/paint/balances/Cargo.toml +++ b/substrate/palette/balances/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-balances" +name = "pallet-balances" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,13 +11,13 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = substrate-keyring = { path = "../../primitives/keyring", optional = true } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } -support = { package = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] runtime-io = { package = "sr-io", path = "../../primitives/sr-io" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } -transaction-payment = { package = "paint-transaction-payment", path = "../transaction-payment" } +transaction-payment = { package = "pallet-transaction-payment", path = "../transaction-payment" } [features] default = ["std"] diff --git a/substrate/paint/balances/src/lib.rs b/substrate/palette/balances/src/lib.rs similarity index 98% rename from substrate/paint/balances/src/lib.rs rename to substrate/palette/balances/src/lib.rs index bdbed61ec2..8f258c0da0 100644 --- a/substrate/paint/balances/src/lib.rs +++ b/substrate/palette/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`](../paint_support/traits/trait.Currency.html): Functions for dealing with a +//! - [`Currency`](../palette_support/traits/trait.Currency.html): Functions for dealing with a //! fungible assets system. -//! - [`ReservableCurrency`](../paint_support/traits/trait.ReservableCurrency.html): +//! - [`ReservableCurrency`](../palette_support/traits/trait.ReservableCurrency.html): //! Functions for dealing with assets that can be reserved from an account. -//! - [`LockableCurrency`](../paint_support/traits/trait.LockableCurrency.html): Functions for +//! - [`LockableCurrency`](../palette_support/traits/trait.LockableCurrency.html): Functions for //! dealing with accounts that allow liquidity restrictions. -//! - [`Imbalance`](../paint_support/traits/trait.Imbalance.html): Functions for handling +//! - [`Imbalance`](../palette_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`](../paint_system/trait.IsDeadAccount.html): Determiner to say whether a +//! - [`IsDeadAccount`](../palette_system/trait.IsDeadAccount.html): Determiner to say whether a //! given account is unused. //! //! ## Interface diff --git a/substrate/paint/balances/src/mock.rs b/substrate/palette/balances/src/mock.rs similarity index 100% rename from substrate/paint/balances/src/mock.rs rename to substrate/palette/balances/src/mock.rs diff --git a/substrate/paint/balances/src/tests.rs b/substrate/palette/balances/src/tests.rs similarity index 100% rename from substrate/paint/balances/src/tests.rs rename to substrate/palette/balances/src/tests.rs diff --git a/substrate/paint/elections/Cargo.toml b/substrate/palette/collective/Cargo.toml similarity index 77% rename from substrate/paint/elections/Cargo.toml rename to substrate/palette/collective/Cargo.toml index 1e8e7702f5..a456b37e9e 100644 --- a/substrate/paint/elections/Cargo.toml +++ b/substrate/palette/collective/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-elections" +name = "pallet-collective" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,12 +12,12 @@ 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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -balances = { package = "paint-balances", path = "../balances" } +balances = { package = "pallet-balances", path = "../balances" } [features] default = ["std"] diff --git a/substrate/paint/collective/src/lib.rs b/substrate/palette/collective/src/lib.rs similarity index 100% rename from substrate/paint/collective/src/lib.rs rename to substrate/palette/collective/src/lib.rs diff --git a/substrate/paint/contracts/COMPLEXITY.md b/substrate/palette/contracts/COMPLEXITY.md similarity index 100% rename from substrate/paint/contracts/COMPLEXITY.md rename to substrate/palette/contracts/COMPLEXITY.md diff --git a/substrate/paint/contracts/Cargo.toml b/substrate/palette/contracts/Cargo.toml similarity index 74% rename from substrate/paint/contracts/Cargo.toml rename to substrate/palette/contracts/Cargo.toml index 728cf72e11..52f6210cda 100644 --- a/substrate/paint/contracts/Cargo.toml +++ b/substrate/palette/contracts/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-contracts" +name = "pallet-contracts" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -15,17 +15,17 @@ 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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] wabt = "0.9.2" assert_matches = "1.3.0" hex-literal = "0.2.1" -balances = { package = "paint-balances", path = "../balances" } +balances = { package = "pallet-balances", path = "../balances" } hex = "0.3.2" -timestamp = { package = "paint-timestamp", path = "../timestamp" } -randomness-collective-flip = { package = "paint-randomness-collective-flip", path = "../randomness-collective-flip" } +timestamp = { package = "pallet-timestamp", path = "../timestamp" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", path = "../randomness-collective-flip" } [features] default = ["std"] diff --git a/substrate/paint/contracts/rpc/Cargo.toml b/substrate/palette/contracts/rpc/Cargo.toml similarity index 87% rename from substrate/paint/contracts/rpc/Cargo.toml rename to substrate/palette/contracts/rpc/Cargo.toml index 723b51a38b..06c8776ece 100644 --- a/substrate/paint/contracts/rpc/Cargo.toml +++ b/substrate/palette/contracts/rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-contracts-rpc" +name = "pallet-contracts-rpc" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -14,4 +14,4 @@ primitives = { package = "substrate-primitives", path = "../../../primitives/co rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" } serde = { version = "1.0.101", features = ["derive"] } sr-primitives = { path = "../../../primitives/sr-primitives" } -paint-contracts-rpc-runtime-api = { path = "./runtime-api" } +pallet-contracts-rpc-runtime-api = { path = "./runtime-api" } diff --git a/substrate/paint/contracts/rpc/runtime-api/Cargo.toml b/substrate/palette/contracts/rpc/runtime-api/Cargo.toml similarity index 94% rename from substrate/paint/contracts/rpc/runtime-api/Cargo.toml rename to substrate/palette/contracts/rpc/runtime-api/Cargo.toml index ac5c2be224..87749fcd19 100644 --- a/substrate/paint/contracts/rpc/runtime-api/Cargo.toml +++ b/substrate/palette/contracts/rpc/runtime-api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-contracts-rpc-runtime-api" +name = "pallet-contracts-rpc-runtime-api" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/substrate/paint/contracts/rpc/runtime-api/src/lib.rs b/substrate/palette/contracts/rpc/runtime-api/src/lib.rs similarity index 100% rename from substrate/paint/contracts/rpc/runtime-api/src/lib.rs rename to substrate/palette/contracts/rpc/runtime-api/src/lib.rs diff --git a/substrate/paint/contracts/rpc/src/lib.rs b/substrate/palette/contracts/rpc/src/lib.rs similarity index 99% rename from substrate/paint/contracts/rpc/src/lib.rs rename to substrate/palette/contracts/rpc/src/lib.rs index e226949d54..9cc1aef938 100644 --- a/substrate/paint/contracts/rpc/src/lib.rs +++ b/substrate/palette/contracts/rpc/src/lib.rs @@ -31,7 +31,7 @@ use sr_primitives::{ }; pub use self::gen_client::Client as ContractsClient; -pub use paint_contracts_rpc_runtime_api::{ +pub use pallet_contracts_rpc_runtime_api::{ self as runtime_api, ContractExecResult, ContractsApi as ContractsRuntimeApi, GetStorageResult, }; diff --git a/substrate/paint/contracts/src/account_db.rs b/substrate/palette/contracts/src/account_db.rs similarity index 100% rename from substrate/paint/contracts/src/account_db.rs rename to substrate/palette/contracts/src/account_db.rs diff --git a/substrate/paint/contracts/src/exec.rs b/substrate/palette/contracts/src/exec.rs similarity index 100% rename from substrate/paint/contracts/src/exec.rs rename to substrate/palette/contracts/src/exec.rs diff --git a/substrate/paint/contracts/src/gas.rs b/substrate/palette/contracts/src/gas.rs similarity index 100% rename from substrate/paint/contracts/src/gas.rs rename to substrate/palette/contracts/src/gas.rs diff --git a/substrate/paint/contracts/src/lib.rs b/substrate/palette/contracts/src/lib.rs similarity index 99% rename from substrate/paint/contracts/src/lib.rs rename to substrate/palette/contracts/src/lib.rs index a4b59226dc..bcb131aa77 100644 --- a/substrate/paint/contracts/src/lib.rs +++ b/substrate/palette/contracts/src/lib.rs @@ -84,7 +84,7 @@ //! //! ## Related Modules //! -//! * [Balances](../paint_balances/index.html) +//! * [Balances](../pallet_balances/index.html) #![cfg_attr(not(feature = "std"), no_std)] diff --git a/substrate/paint/contracts/src/rent.rs b/substrate/palette/contracts/src/rent.rs similarity index 100% rename from substrate/paint/contracts/src/rent.rs rename to substrate/palette/contracts/src/rent.rs diff --git a/substrate/paint/contracts/src/tests.rs b/substrate/palette/contracts/src/tests.rs similarity index 100% rename from substrate/paint/contracts/src/tests.rs rename to substrate/palette/contracts/src/tests.rs diff --git a/substrate/paint/contracts/src/wasm/code_cache.rs b/substrate/palette/contracts/src/wasm/code_cache.rs similarity index 100% rename from substrate/paint/contracts/src/wasm/code_cache.rs rename to substrate/palette/contracts/src/wasm/code_cache.rs diff --git a/substrate/paint/contracts/src/wasm/env_def/macros.rs b/substrate/palette/contracts/src/wasm/env_def/macros.rs similarity index 100% rename from substrate/paint/contracts/src/wasm/env_def/macros.rs rename to substrate/palette/contracts/src/wasm/env_def/macros.rs diff --git a/substrate/paint/contracts/src/wasm/env_def/mod.rs b/substrate/palette/contracts/src/wasm/env_def/mod.rs similarity index 100% rename from substrate/paint/contracts/src/wasm/env_def/mod.rs rename to substrate/palette/contracts/src/wasm/env_def/mod.rs diff --git a/substrate/paint/contracts/src/wasm/mod.rs b/substrate/palette/contracts/src/wasm/mod.rs similarity index 100% rename from substrate/paint/contracts/src/wasm/mod.rs rename to substrate/palette/contracts/src/wasm/mod.rs diff --git a/substrate/paint/contracts/src/wasm/prepare.rs b/substrate/palette/contracts/src/wasm/prepare.rs similarity index 100% rename from substrate/paint/contracts/src/wasm/prepare.rs rename to substrate/palette/contracts/src/wasm/prepare.rs diff --git a/substrate/paint/contracts/src/wasm/runtime.rs b/substrate/palette/contracts/src/wasm/runtime.rs similarity index 100% rename from substrate/paint/contracts/src/wasm/runtime.rs rename to substrate/palette/contracts/src/wasm/runtime.rs diff --git a/substrate/paint/democracy/Cargo.toml b/substrate/palette/democracy/Cargo.toml similarity index 77% rename from substrate/paint/democracy/Cargo.toml rename to substrate/palette/democracy/Cargo.toml index 1f28c013c5..98f9eed993 100644 --- a/substrate/paint/democracy/Cargo.toml +++ b/substrate/palette/democracy/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-democracy" +name = "pallet-democracy" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -11,12 +11,12 @@ 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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] primitives = { package = "substrate-primitives", path = "../../primitives/core" } -balances = { package = "paint-balances", path = "../balances" } +balances = { package = "pallet-balances", path = "../balances" } [features] default = ["std"] diff --git a/substrate/paint/democracy/src/lib.rs b/substrate/palette/democracy/src/lib.rs similarity index 100% rename from substrate/paint/democracy/src/lib.rs rename to substrate/palette/democracy/src/lib.rs diff --git a/substrate/paint/democracy/src/vote_threshold.rs b/substrate/palette/democracy/src/vote_threshold.rs similarity index 100% rename from substrate/paint/democracy/src/vote_threshold.rs rename to substrate/palette/democracy/src/vote_threshold.rs diff --git a/substrate/paint/elections-phragmen/Cargo.toml b/substrate/palette/elections-phragmen/Cargo.toml similarity index 75% rename from substrate/paint/elections-phragmen/Cargo.toml rename to substrate/palette/elections-phragmen/Cargo.toml index 0fb1f62465..a9b3da18c9 100644 --- a/substrate/paint/elections-phragmen/Cargo.toml +++ b/substrate/palette/elections-phragmen/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-elections-phragmen" +name = "pallet-elections-phragmen" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -8,14 +8,14 @@ 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 } -paint-support = { path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +palette-support = { path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } [dev-dependencies] runtime_io = { package = "sr-io", path = "../../primitives/sr-io" } hex-literal = "0.2.1" -balances = { package = "paint-balances", path = "../balances" } +balances = { package = "pallet-balances", path = "../balances" } primitives = { package = "substrate-primitives", path = "../../primitives/core" } serde = { version = "1.0.101" } @@ -23,7 +23,7 @@ serde = { version = "1.0.101" } default = ["std"] std = [ "codec/std", - "paint-support/std", + "palette-support/std", "sr-primitives/std", "phragmen/std", "system/std", diff --git a/substrate/paint/elections-phragmen/src/lib.rs b/substrate/palette/elections-phragmen/src/lib.rs similarity index 99% rename from substrate/paint/elections-phragmen/src/lib.rs rename to substrate/palette/elections-phragmen/src/lib.rs index 0a615bb8c9..7ecbfe84b8 100644 --- a/substrate/paint/elections-phragmen/src/lib.rs +++ b/substrate/palette/elections-phragmen/src/lib.rs @@ -80,7 +80,7 @@ use rstd::prelude::*; use codec::Decode; use sr_primitives::{print, traits::{Zero, StaticLookup, Bounded, Convert}}; use sr_primitives::weights::SimpleDispatchInfo; -use paint_support::{ +use palette_support::{ decl_storage, decl_event, ensure, decl_module, dispatch, storage::unhashed, traits::{ @@ -667,7 +667,7 @@ impl Module { mod tests { use super::*; use std::cell::RefCell; - use paint_support::{assert_ok, assert_noop, parameter_types, assert_eq_uvec}; + use palette_support::{assert_ok, assert_noop, parameter_types, assert_eq_uvec}; use primitives::H256; use sr_primitives::{ Perbill, testing::Header, BuildStorage, @@ -783,7 +783,7 @@ mod tests { pub type Block = sr_primitives::generic::Block; pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic; - paint_support::construct_runtime!( + palette_support::construct_runtime!( pub enum Test where Block = Block, NodeBlock = Block, @@ -863,7 +863,7 @@ mod tests { #[test] fn temp_migration_works() { ExtBuilder::default().build().execute_with(|| { - use paint_support::storage::unhashed; + use palette_support::storage::unhashed; use codec::Encode; let old_members = vec![1u64, 2]; diff --git a/substrate/paint/collective/Cargo.toml b/substrate/palette/elections/Cargo.toml similarity index 77% rename from substrate/paint/collective/Cargo.toml rename to substrate/palette/elections/Cargo.toml index 3f629f25c1..ca5ba6bc17 100644 --- a/substrate/paint/collective/Cargo.toml +++ b/substrate/palette/elections/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-collective" +name = "pallet-elections" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -12,12 +12,12 @@ 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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.1" -balances = { package = "paint-balances", path = "../balances" } +balances = { package = "pallet-balances", path = "../balances" } [features] default = ["std"] diff --git a/substrate/paint/elections/src/lib.rs b/substrate/palette/elections/src/lib.rs similarity index 100% rename from substrate/paint/elections/src/lib.rs rename to substrate/palette/elections/src/lib.rs diff --git a/substrate/paint/elections/src/mock.rs b/substrate/palette/elections/src/mock.rs similarity index 100% rename from substrate/paint/elections/src/mock.rs rename to substrate/palette/elections/src/mock.rs diff --git a/substrate/paint/elections/src/tests.rs b/substrate/palette/elections/src/tests.rs similarity index 100% rename from substrate/paint/elections/src/tests.rs rename to substrate/palette/elections/src/tests.rs diff --git a/substrate/paint/evm/Cargo.toml b/substrate/palette/evm/Cargo.toml similarity index 75% rename from substrate/paint/evm/Cargo.toml rename to substrate/palette/evm/Cargo.toml index 45cb990861..ca6ed080e8 100644 --- a/substrate/paint/evm/Cargo.toml +++ b/substrate/palette/evm/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-evm" +name = "pallet-evm" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -7,10 +7,10 @@ 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 = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } -timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false } -balances = { package = "paint-balances", path = "../balances", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-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 } sr-primitives = { path = "../../primitives/sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false } diff --git a/substrate/paint/evm/src/backend.rs b/substrate/palette/evm/src/backend.rs similarity index 100% rename from substrate/paint/evm/src/backend.rs rename to substrate/palette/evm/src/backend.rs diff --git a/substrate/paint/evm/src/lib.rs b/substrate/palette/evm/src/lib.rs similarity index 100% rename from substrate/paint/evm/src/lib.rs rename to substrate/palette/evm/src/lib.rs diff --git a/substrate/paint/example/Cargo.toml b/substrate/palette/example/Cargo.toml similarity index 73% rename from substrate/paint/example/Cargo.toml rename to substrate/palette/example/Cargo.toml index c25e91235f..c2d0d2a6b2 100644 --- a/substrate/paint/example/Cargo.toml +++ b/substrate/palette/example/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "paint-example" +name = "pallet-example" version = "2.0.0" authors = ["Parity Technologies "] edition = "2018" @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false } -support = { package = "paint-support", path = "../support", default-features = false } -system = { package = "paint-system", path = "../system", default-features = false } -balances = { package = "paint-balances", path = "../balances", default-features = false } +support = { package = "palette-support", path = "../support", default-features = false } +system = { package = "palette-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 } runtime-io = { package = "sr-io", path = "../../primitives/sr-io", default-features = false } diff --git a/substrate/paint/example/src/lib.rs b/substrate/palette/example/src/lib.rs similarity index 99% rename from substrate/paint/example/src/lib.rs rename to substrate/palette/example/src/lib.rs index 2fdee498e0..87693fcfa8 100644 --- a/substrate/paint/example/src/lib.rs +++ b/substrate/palette/example/src/lib.rs @@ -20,7 +20,7 @@ //! The Example: A simple example of a runtime module demonstrating //! concepts, APIs and structures common to most runtime modules. //! -//! Run `cargo doc --package paint-example --open` to view this module's documentation. +//! Run `cargo doc --package pallet-example --open` to view this module's documentation. //! //! ### Documentation Guidelines: //! @@ -49,8 +49,8 @@ //! //! ### Documentation Template:
//! -//! Copy and paste this template from paint/example/src/lib.rs into file -//! `paint//src/lib.rs` of your own custom module and complete it. +//! 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. //! 

 //! // Add heading with custom module name
 //!
diff --git a/substrate/paint/executive/Cargo.toml b/substrate/palette/executive/Cargo.toml
similarity index 66%
rename from substrate/paint/executive/Cargo.toml
rename to substrate/palette/executive/Cargo.toml
index 9dbea514d2..d0e3438772 100644
--- a/substrate/paint/executive/Cargo.toml
+++ b/substrate/palette/executive/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-executive"
+name = "palette-executive"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,15 +10,15 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 hex-literal = "0.2.1"
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-paint-indices = { path = "../indices" }
-balances = { package = "paint-balances", path = "../balances" }
-transaction-payment = { package = "paint-transaction-payment", path = "../transaction-payment" }
+pallet-indices = { path = "../indices" }
+balances = { package = "pallet-balances", path = "../balances" }
+transaction-payment = { package = "pallet-transaction-payment", path = "../transaction-payment" }
 
 [features]
 default = ["std"]
diff --git a/substrate/paint/executive/src/lib.rs b/substrate/palette/executive/src/lib.rs
similarity index 99%
rename from substrate/paint/executive/src/lib.rs
rename to substrate/palette/executive/src/lib.rs
index 95c04c5355..998fb65eda 100644
--- a/substrate/paint/executive/src/lib.rs
+++ b/substrate/palette/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](../paint_system/index.html) to perform these cross-cutting functions.
+//! [SRML System module](../palette_system/index.html) to perform these cross-cutting functions.
 //!
 //! The Executive module provides functions to:
 //!
@@ -51,7 +51,7 @@
 //!
 //! ```
 //! # use sr_primitives::generic;
-//! # use paint_executive as executive;
+//! # use palette_executive as executive;
 //! # pub struct UncheckedExtrinsic {};
 //! # pub struct Header {};
 //! # type Context = system::ChainContext;
diff --git a/substrate/paint/finality-tracker/Cargo.toml b/substrate/palette/finality-tracker/Cargo.toml
similarity index 83%
rename from substrate/paint/finality-tracker/Cargo.toml
rename to substrate/palette/finality-tracker/Cargo.toml
index ba7e265bea..c1b6214a6e 100644
--- a/substrate/paint/finality-tracker/Cargo.toml
+++ b/substrate/palette/finality-tracker/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-finality-tracker"
+name = "pallet-finality-tracker"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -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 = "paint-support", path = "../support", default-features = false }
-paint-system = { path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+palette-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",
-	"paint-system/std",
+	"palette-system/std",
 	"sp-finality-tracker/std",
 	"inherents/std",
 ]
diff --git a/substrate/paint/finality-tracker/src/lib.rs b/substrate/palette/finality-tracker/src/lib.rs
similarity index 97%
rename from substrate/paint/finality-tracker/src/lib.rs
rename to substrate/palette/finality-tracker/src/lib.rs
index 1b69c2c870..e7922f3368 100644
--- a/substrate/paint/finality-tracker/src/lib.rs
+++ b/substrate/palette/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 paint_system::{ensure_none, Trait as SystemTrait};
+use palette_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!(
-				paint_system::Module::::block_number() >= hint,
+				palette_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 = paint_system::Module::::block_number();
+			let now = palette_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 paint_system as system;
+	use palette_system as system;
 	use std::cell::RefCell;
 
 	#[derive(Clone, PartialEq, Debug)]
diff --git a/substrate/paint/generic-asset/Cargo.toml b/substrate/palette/generic-asset/Cargo.toml
similarity index 79%
rename from substrate/paint/generic-asset/Cargo.toml
rename to substrate/palette/generic-asset/Cargo.toml
index db0bae7a46..9ba0d99af4 100644
--- a/substrate/paint/generic-asset/Cargo.toml
+++ b/substrate/palette/generic-asset/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-generic-asset"
+name = "pallet-generic-asset"
 version = "2.0.0"
 authors = ["Centrality Developers "]
 edition = "2018"
@@ -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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/substrate/paint/generic-asset/src/lib.rs b/substrate/palette/generic-asset/src/lib.rs
similarity index 100%
rename from substrate/paint/generic-asset/src/lib.rs
rename to substrate/palette/generic-asset/src/lib.rs
diff --git a/substrate/paint/generic-asset/src/mock.rs b/substrate/palette/generic-asset/src/mock.rs
similarity index 100%
rename from substrate/paint/generic-asset/src/mock.rs
rename to substrate/palette/generic-asset/src/mock.rs
diff --git a/substrate/paint/generic-asset/src/tests.rs b/substrate/palette/generic-asset/src/tests.rs
similarity index 100%
rename from substrate/paint/generic-asset/src/tests.rs
rename to substrate/palette/generic-asset/src/tests.rs
diff --git a/substrate/paint/grandpa/Cargo.toml b/substrate/palette/grandpa/Cargo.toml
similarity index 74%
rename from substrate/paint/grandpa/Cargo.toml
rename to substrate/palette/grandpa/Cargo.toml
index 956478b41a..1118261c1d 100644
--- a/substrate/paint/grandpa/Cargo.toml
+++ b/substrate/palette/grandpa/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-grandpa"
+name = "pallet-grandpa"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -12,10 +12,10 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
-session = { package = "paint-session", path = "../session", default-features = false }
-finality-tracker = { package = "paint-finality-tracker", path = "../finality-tracker", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-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 }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/substrate/paint/grandpa/src/lib.rs b/substrate/palette/grandpa/src/lib.rs
similarity index 100%
rename from substrate/paint/grandpa/src/lib.rs
rename to substrate/palette/grandpa/src/lib.rs
diff --git a/substrate/paint/grandpa/src/mock.rs b/substrate/palette/grandpa/src/mock.rs
similarity index 100%
rename from substrate/paint/grandpa/src/mock.rs
rename to substrate/palette/grandpa/src/mock.rs
diff --git a/substrate/paint/grandpa/src/tests.rs b/substrate/palette/grandpa/src/tests.rs
similarity index 100%
rename from substrate/paint/grandpa/src/tests.rs
rename to substrate/palette/grandpa/src/tests.rs
diff --git a/substrate/paint/im-online/Cargo.toml b/substrate/palette/im-online/Cargo.toml
similarity index 76%
rename from substrate/paint/im-online/Cargo.toml
rename to substrate/palette/im-online/Cargo.toml
index e509620f6e..72832b8aeb 100644
--- a/substrate/paint/im-online/Cargo.toml
+++ b/substrate/palette/im-online/Cargo.toml
@@ -1,22 +1,22 @@
 [package]
-name = "paint-im-online"
+name = "pallet-im-online"
 version = "0.1.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
 app-crypto = { package = "substrate-application-crypto", path = "../../primitives/application-crypto", default-features = false }
-authorship = { package = "paint-authorship", path = "../authorship", default-features = false }
+authorship = { package = "pallet-authorship", path = "../authorship", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 primitives = { package="substrate-primitives", path = "../../primitives/core", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true }
-session = { package = "paint-session", path = "../session", default-features = false }
+session = { package = "pallet-session", path = "../session", default-features = false }
 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 offchain = { package = "substrate-offchain", path = "../../client/offchain" }
diff --git a/substrate/paint/im-online/src/lib.rs b/substrate/palette/im-online/src/lib.rs
similarity index 99%
rename from substrate/paint/im-online/src/lib.rs
rename to substrate/palette/im-online/src/lib.rs
index 4df8f442e4..79dc36d348 100644
--- a/substrate/paint/im-online/src/lib.rs
+++ b/substrate/palette/im-online/src/lib.rs
@@ -44,7 +44,7 @@
 //! ```
 //! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
-//! use paint_im_online::{self as im_online};
+//! use pallet_im_online::{self as im_online};
 //!
 //! pub trait Trait: im_online::Trait {}
 //!
@@ -62,7 +62,7 @@
 //!
 //! ## Dependencies
 //!
-//! This module depends on the [Session module](../paint_session/index.html).
+//! This module depends on the [Session module](../pallet_session/index.html).
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -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"paint/im-online-worker-status";
+const DB_KEY: &[u8] = b"palette/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/paint/im-online/src/mock.rs b/substrate/palette/im-online/src/mock.rs
similarity index 100%
rename from substrate/paint/im-online/src/mock.rs
rename to substrate/palette/im-online/src/mock.rs
diff --git a/substrate/paint/im-online/src/tests.rs b/substrate/palette/im-online/src/tests.rs
similarity index 100%
rename from substrate/paint/im-online/src/tests.rs
rename to substrate/palette/im-online/src/tests.rs
diff --git a/substrate/paint/indices/Cargo.toml b/substrate/palette/indices/Cargo.toml
similarity index 83%
rename from substrate/paint/indices/Cargo.toml
rename to substrate/palette/indices/Cargo.toml
index 443d28ba87..c5206f617f 100644
--- a/substrate/paint/indices/Cargo.toml
+++ b/substrate/palette/indices/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-indices"
+name = "pallet-indices"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 ref_thread_local = "0.0.0"
diff --git a/substrate/paint/indices/src/address.rs b/substrate/palette/indices/src/address.rs
similarity index 100%
rename from substrate/paint/indices/src/address.rs
rename to substrate/palette/indices/src/address.rs
diff --git a/substrate/paint/indices/src/lib.rs b/substrate/palette/indices/src/lib.rs
similarity index 100%
rename from substrate/paint/indices/src/lib.rs
rename to substrate/palette/indices/src/lib.rs
diff --git a/substrate/paint/indices/src/mock.rs b/substrate/palette/indices/src/mock.rs
similarity index 100%
rename from substrate/paint/indices/src/mock.rs
rename to substrate/palette/indices/src/mock.rs
diff --git a/substrate/paint/indices/src/tests.rs b/substrate/palette/indices/src/tests.rs
similarity index 100%
rename from substrate/paint/indices/src/tests.rs
rename to substrate/palette/indices/src/tests.rs
diff --git a/substrate/paint/membership/Cargo.toml b/substrate/palette/membership/Cargo.toml
similarity index 79%
rename from substrate/paint/membership/Cargo.toml
rename to substrate/palette/membership/Cargo.toml
index fc75bc4c69..99787aaf65 100644
--- a/substrate/paint/membership/Cargo.toml
+++ b/substrate/palette/membership/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-membership"
+name = "pallet-membership"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/paint/membership/src/lib.rs b/substrate/palette/membership/src/lib.rs
similarity index 100%
rename from substrate/paint/membership/src/lib.rs
rename to substrate/palette/membership/src/lib.rs
diff --git a/substrate/paint/metadata/Cargo.toml b/substrate/palette/metadata/Cargo.toml
similarity index 95%
rename from substrate/paint/metadata/Cargo.toml
rename to substrate/palette/metadata/Cargo.toml
index 1d7185cc10..469a3ab056 100644
--- a/substrate/paint/metadata/Cargo.toml
+++ b/substrate/palette/metadata/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-metadata"
+name = "palette-metadata"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/paint/metadata/src/lib.rs b/substrate/palette/metadata/src/lib.rs
similarity index 100%
rename from substrate/paint/metadata/src/lib.rs
rename to substrate/palette/metadata/src/lib.rs
diff --git a/substrate/paint/nicks/Cargo.toml b/substrate/palette/nicks/Cargo.toml
similarity index 73%
rename from substrate/paint/nicks/Cargo.toml
rename to substrate/palette/nicks/Cargo.toml
index 9e78254332..466d9d735f 100644
--- a/substrate/paint/nicks/Cargo.toml
+++ b/substrate/palette/nicks/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-nicks"
+name = "pallet-nicks"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,12 +10,12 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "paint-balances", path = "../balances", default-features = false }
+balances = { package = "pallet-balances", path = "../balances", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/substrate/paint/nicks/src/lib.rs b/substrate/palette/nicks/src/lib.rs
similarity index 100%
rename from substrate/paint/nicks/src/lib.rs
rename to substrate/palette/nicks/src/lib.rs
diff --git a/substrate/paint/offences/Cargo.toml b/substrate/palette/offences/Cargo.toml
similarity index 75%
rename from substrate/paint/offences/Cargo.toml
rename to substrate/palette/offences/Cargo.toml
index 8eb217c8b3..8cc3ced354 100644
--- a/substrate/paint/offences/Cargo.toml
+++ b/substrate/palette/offences/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
-name = "paint-offences"
+name = "pallet-offences"
 version = "1.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-balances = { package = "paint-balances", path = "../balances", default-features = false }
+balances = { package = "pallet-balances", path = "../balances", 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 }
 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/substrate/paint/offences/src/lib.rs b/substrate/palette/offences/src/lib.rs
similarity index 100%
rename from substrate/paint/offences/src/lib.rs
rename to substrate/palette/offences/src/lib.rs
diff --git a/substrate/paint/offences/src/mock.rs b/substrate/palette/offences/src/mock.rs
similarity index 97%
rename from substrate/paint/offences/src/mock.rs
rename to substrate/palette/offences/src/mock.rs
index 6ae0e35b9b..e8e4c864d1 100644
--- a/substrate/paint/offences/src/mock.rs
+++ b/substrate/palette/offences/src/mock.rs
@@ -148,7 +148,7 @@ impl offence::Offence for Offence {
 	}
 
 	fn session_index(&self) -> SessionIndex {
-		// session index is not used by the paint-offences directly, but rather it exists only for
+		// session index is not used by the pallet-offences directly, but rather it exists only for
 		// filtering historical reports.
 		unimplemented!()
 	}
diff --git a/substrate/paint/offences/src/tests.rs b/substrate/palette/offences/src/tests.rs
similarity index 100%
rename from substrate/paint/offences/src/tests.rs
rename to substrate/palette/offences/src/tests.rs
diff --git a/substrate/paint/randomness-collective-flip/Cargo.toml b/substrate/palette/randomness-collective-flip/Cargo.toml
similarity index 77%
rename from substrate/paint/randomness-collective-flip/Cargo.toml
rename to substrate/palette/randomness-collective-flip/Cargo.toml
index 97e56d1a83..0d623246fa 100644
--- a/substrate/paint/randomness-collective-flip/Cargo.toml
+++ b/substrate/palette/randomness-collective-flip/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-randomness-collective-flip"
+name = "pallet-randomness-collective-flip"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 rstd = { package = "sr-std", path = "../../primitives/sr-std", default-features = false }
 
 [dev-dependencies]
diff --git a/substrate/paint/randomness-collective-flip/src/lib.rs b/substrate/palette/randomness-collective-flip/src/lib.rs
similarity index 99%
rename from substrate/paint/randomness-collective-flip/src/lib.rs
rename to substrate/palette/randomness-collective-flip/src/lib.rs
index 62170e8a88..595249b986 100644
--- a/substrate/paint/randomness-collective-flip/src/lib.rs
+++ b/substrate/palette/randomness-collective-flip/src/lib.rs
@@ -42,7 +42,7 @@
 //! decl_module! {
 //! 	pub struct Module for enum Call where origin: T::Origin {
 //! 		pub fn random_module_example(origin) -> Result {
-//! 			let _random_seed = >::random_seed();
+//! 			let _random_seed = >::random_seed();
 //! 			Ok(())
 //! 		}
 //! 	}
diff --git a/substrate/paint/scored-pool/Cargo.toml b/substrate/palette/scored-pool/Cargo.toml
similarity index 74%
rename from substrate/paint/scored-pool/Cargo.toml
rename to substrate/palette/scored-pool/Cargo.toml
index 35da18437b..0c73454a25 100644
--- a/substrate/paint/scored-pool/Cargo.toml
+++ b/substrate/palette/scored-pool/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-scored-pool"
+name = "pallet-scored-pool"
 version = "1.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -10,11 +10,11 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-balances = { package = "paint-balances", path = "../balances" }
+balances = { package = "pallet-balances", path = "../balances" }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
 
 [features]
diff --git a/substrate/paint/scored-pool/src/lib.rs b/substrate/palette/scored-pool/src/lib.rs
similarity index 99%
rename from substrate/paint/scored-pool/src/lib.rs
rename to substrate/palette/scored-pool/src/lib.rs
index 3ed4b8f21f..0f1fdb7a3b 100644
--- a/substrate/paint/scored-pool/src/lib.rs
+++ b/substrate/palette/scored-pool/src/lib.rs
@@ -55,7 +55,7 @@
 //! ```
 //! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
-//! use paint_scored_pool::{self as scored_pool};
+//! use pallet_scored_pool::{self as scored_pool};
 //!
 //! pub trait Trait: scored_pool::Trait {}
 //!
@@ -77,7 +77,7 @@
 //!
 //! ## Dependencies
 //!
-//! This module depends on the [System module](../paint_system/index.html).
+//! This module depends on the [System module](../palette_system/index.html).
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/substrate/paint/scored-pool/src/mock.rs b/substrate/palette/scored-pool/src/mock.rs
similarity index 100%
rename from substrate/paint/scored-pool/src/mock.rs
rename to substrate/palette/scored-pool/src/mock.rs
diff --git a/substrate/paint/scored-pool/src/tests.rs b/substrate/palette/scored-pool/src/tests.rs
similarity index 100%
rename from substrate/paint/scored-pool/src/tests.rs
rename to substrate/palette/scored-pool/src/tests.rs
diff --git a/substrate/paint/session/Cargo.toml b/substrate/palette/session/Cargo.toml
similarity index 81%
rename from substrate/paint/session/Cargo.toml
rename to substrate/palette/session/Cargo.toml
index 3a5b1476a4..ff4625c0e4 100644
--- a/substrate/paint/session/Cargo.toml
+++ b/substrate/palette/session/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-session"
+name = "pallet-session"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition =  "2018"
@@ -11,9 +11,9 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
-timestamp = { package = "paint-timestamp", path = "../timestamp", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-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 }
 impl-trait-for-tuples = "0.1.3"
diff --git a/substrate/paint/session/src/historical.rs b/substrate/palette/session/src/historical.rs
similarity index 100%
rename from substrate/paint/session/src/historical.rs
rename to substrate/palette/session/src/historical.rs
diff --git a/substrate/paint/session/src/lib.rs b/substrate/palette/session/src/lib.rs
similarity index 98%
rename from substrate/paint/session/src/lib.rs
rename to substrate/palette/session/src/lib.rs
index 988c4c5228..2057900f79 100644
--- a/substrate/paint/session/src/lib.rs
+++ b/substrate/palette/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](../paint_consensus/index.html)
+//! using `set_key`. If it was then we call `set_authority` from the [Consensus module](../palette_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
@@ -100,10 +100,10 @@
 //!
 //! ### Example from the SRML
 //!
-//! The [Staking module](../paint_staking/index.html) uses the Session module to get the validator set.
+//! The [Staking module](../pallet_staking/index.html) uses the Session module to get the validator set.
 //!
 //! ```
-//! use paint_session as session;
+//! use pallet_session as session;
 //! # fn not_executed() {
 //!
 //! let validators = >::validators();
@@ -113,9 +113,9 @@
 //!
 //! ## Related Modules
 //!
-//! - [Consensus](../paint_consensus/index.html)
-//! - [Staking](../paint_staking/index.html)
-//! - [Timestamp](../paint_timestamp/index.html)
+//! - [Consensus](../palette_consensus/index.html)
+//! - [Staking](../pallet_staking/index.html)
+//! - [Timestamp](../pallet_timestamp/index.html)
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -358,7 +358,7 @@ pub trait Trait: system::Trait {
 	/// The fraction of validators set that is safe to be disabled.
 	///
 	/// After the threshold is reached `disabled` method starts to return true,
-	/// which in combination with `paint_staking` forces a new era.
+	/// which in combination with `pallet_staking` forces a new era.
 	type DisabledValidatorsThreshold: Get;
 
 	/// Select initial validators.
diff --git a/substrate/paint/session/src/mock.rs b/substrate/palette/session/src/mock.rs
similarity index 100%
rename from substrate/paint/session/src/mock.rs
rename to substrate/palette/session/src/mock.rs
diff --git a/substrate/paint/staking/Cargo.toml b/substrate/palette/staking/Cargo.toml
similarity index 67%
rename from substrate/paint/staking/Cargo.toml
rename to substrate/palette/staking/Cargo.toml
index 7632ae38c4..0bc1b17d8e 100644
--- a/substrate/paint/staking/Cargo.toml
+++ b/substrate/palette/staking/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-staking"
+name = "pallet-staking"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -14,16 +14,16 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
-session = { package = "paint-session", path = "../session", default-features = false, features = ["historical"] }
-authorship = { package = "paint-authorship", path = "../authorship", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-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 }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "paint-balances", path = "../balances" }
-timestamp = { package = "paint-timestamp", path = "../timestamp" }
-paint-staking-reward-curve = { path = "../staking/reward-curve"}
+balances = { package = "pallet-balances", path = "../balances" }
+timestamp = { package = "pallet-timestamp", path = "../timestamp" }
+pallet-staking-reward-curve = { path = "../staking/reward-curve"}
 
 [features]
 equalize = []
diff --git a/substrate/paint/staking/reward-curve/Cargo.toml b/substrate/palette/staking/reward-curve/Cargo.toml
similarity index 90%
rename from substrate/paint/staking/reward-curve/Cargo.toml
rename to substrate/palette/staking/reward-curve/Cargo.toml
index 03b6ab8955..11ce7cefb4 100644
--- a/substrate/paint/staking/reward-curve/Cargo.toml
+++ b/substrate/palette/staking/reward-curve/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-staking-reward-curve"
+name = "pallet-staking-reward-curve"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/paint/staking/reward-curve/src/lib.rs b/substrate/palette/staking/reward-curve/src/lib.rs
similarity index 99%
rename from substrate/paint/staking/reward-curve/src/lib.rs
rename to substrate/palette/staking/reward-curve/src/lib.rs
index 947a9a84d0..3bde53b55f 100644
--- a/substrate/paint/staking/reward-curve/src/lib.rs
+++ b/substrate/palette/staking/reward-curve/src/lib.rs
@@ -44,7 +44,7 @@ use syn::parse::{Parse, ParseStream};
 /// # fn main() {}
 /// use sr_primitives::curve::PiecewiseLinear;
 ///
-/// paint_staking_reward_curve::build! {
+/// pallet_staking_reward_curve::build! {
 /// 	const I_NPOS: PiecewiseLinear<'static> = curve!(
 /// 		min_inflation: 0_025_000,
 /// 		max_inflation: 0_100_000,
@@ -373,7 +373,7 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
 
 	quote!(
 		#[cfg(test)]
-		mod __paint_staking_reward_curve_test_module {
+		mod __pallet_staking_reward_curve_test_module {
 			fn i_npos(x: f64) -> f64 {
 				if x <= #x_ideal {
 					#i_0 + x * (#i_ideal - #i_0 / #x_ideal)
diff --git a/substrate/paint/staking/reward-curve/src/log.rs b/substrate/palette/staking/reward-curve/src/log.rs
similarity index 100%
rename from substrate/paint/staking/reward-curve/src/log.rs
rename to substrate/palette/staking/reward-curve/src/log.rs
diff --git a/substrate/paint/staking/reward-curve/tests/test.rs b/substrate/palette/staking/reward-curve/tests/test.rs
similarity index 88%
rename from substrate/paint/staking/reward-curve/tests/test.rs
rename to substrate/palette/staking/reward-curve/tests/test.rs
index be7f0cbd18..4ed2def3fe 100644
--- a/substrate/paint/staking/reward-curve/tests/test.rs
+++ b/substrate/palette/staking/reward-curve/tests/test.rs
@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Test crate for paint-staking-reward-curve. Allows to test for procedural macro.
+//! Test crate for pallet-staking-reward-curve. Allows to test for procedural macro.
 //! See tests directory.
 
 mod test_small_falloff {
-	paint_staking_reward_curve::build! {
+	pallet_staking_reward_curve::build! {
 		const REWARD_CURVE: sr_primitives::curve::PiecewiseLinear<'static> = curve!(
 			min_inflation: 0_020_000,
 			max_inflation: 0_200_000,
@@ -31,7 +31,7 @@ mod test_small_falloff {
 }
 
 mod test_big_falloff {
-	paint_staking_reward_curve::build! {
+	pallet_staking_reward_curve::build! {
 		const REWARD_CURVE: sr_primitives::curve::PiecewiseLinear<'static> = curve!(
 			min_inflation: 0_100_000,
 			max_inflation: 0_400_000,
diff --git a/substrate/paint/staking/src/inflation.rs b/substrate/palette/staking/src/inflation.rs
similarity index 99%
rename from substrate/paint/staking/src/inflation.rs
rename to substrate/palette/staking/src/inflation.rs
index 11cf3151f6..914d2ee93a 100644
--- a/substrate/paint/staking/src/inflation.rs
+++ b/substrate/palette/staking/src/inflation.rs
@@ -49,7 +49,7 @@ pub fn compute_total_payout(
 mod test {
 	use sr_primitives::curve::PiecewiseLinear;
 
-	paint_staking_reward_curve::build! {
+	pallet_staking_reward_curve::build! {
 		const I_NPOS: PiecewiseLinear<'static> = curve!(
 			min_inflation: 0_025_000,
 			max_inflation: 0_100_000,
diff --git a/substrate/paint/staking/src/lib.rs b/substrate/palette/staking/src/lib.rs
similarity index 99%
rename from substrate/paint/staking/src/lib.rs
rename to substrate/palette/staking/src/lib.rs
index 3ef7032783..d7681da76f 100644
--- a/substrate/paint/staking/src/lib.rs
+++ b/substrate/palette/staking/src/lib.rs
@@ -138,7 +138,7 @@
 //! ```
 //! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
-//! use paint_staking::{self as staking};
+//! use pallet_staking::{self as staking};
 //!
 //! pub trait Trait: staking::Trait {}
 //!
@@ -179,7 +179,7 @@
 //! [`reward_by_indices`](./enum.Call.html#variant.reward_by_indices).
 //!
 //! [`Module`](./struct.Module.html) implements
-//! [`authorship::EventHandler`](../paint_authorship/trait.EventHandler.html) to add reward points
+//! [`authorship::EventHandler`](../pallet_authorship/trait.EventHandler.html) to add reward points
 //! to block producer and block producer of referenced uncles.
 //!
 //! The validator and its nominator split their reward as following:
@@ -237,8 +237,8 @@
 //!
 //! ## Related Modules
 //!
-//! - [Balances](../paint_balances/index.html): Used to manage values at stake.
-//! - [Session](../paint_session/index.html): Used to manage sessions. Also, a list of new validators
+//! - [Balances](../pallet_balances/index.html): Used to manage values at stake.
+//! - [Session](../pallet_session/index.html): Used to manage sessions. Also, a list of new validators
 //! is stored in the Session module's `Validators` at the end of each era.
 
 #![recursion_limit="128"]
diff --git a/substrate/paint/staking/src/mock.rs b/substrate/palette/staking/src/mock.rs
similarity index 99%
rename from substrate/paint/staking/src/mock.rs
rename to substrate/palette/staking/src/mock.rs
index ff9bfe50a5..c2a0745983 100644
--- a/substrate/paint/staking/src/mock.rs
+++ b/substrate/palette/staking/src/mock.rs
@@ -178,7 +178,7 @@ impl timestamp::Trait for Test {
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 }
-paint_staking_reward_curve::build! {
+pallet_staking_reward_curve::build! {
 	const I_NPOS: PiecewiseLinear<'static> = curve!(
 		min_inflation: 0_025_000,
 		max_inflation: 0_100_000,
diff --git a/substrate/paint/staking/src/tests.rs b/substrate/palette/staking/src/tests.rs
similarity index 100%
rename from substrate/paint/staking/src/tests.rs
rename to substrate/palette/staking/src/tests.rs
diff --git a/substrate/paint/sudo/Cargo.toml b/substrate/palette/sudo/Cargo.toml
similarity index 80%
rename from substrate/paint/sudo/Cargo.toml
rename to substrate/palette/sudo/Cargo.toml
index 2bd1e83585..2d6c1b17bd 100644
--- a/substrate/paint/sudo/Cargo.toml
+++ b/substrate/palette/sudo/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-sudo"
+name = "pallet-sudo"
 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
diff --git a/substrate/paint/sudo/src/lib.rs b/substrate/palette/sudo/src/lib.rs
similarity index 98%
rename from substrate/paint/sudo/src/lib.rs
rename to substrate/palette/sudo/src/lib.rs
index 326c07cf8f..f67de6f6d8 100644
--- a/substrate/paint/sudo/src/lib.rs
+++ b/substrate/palette/sudo/src/lib.rs
@@ -77,8 +77,8 @@
 //!
 //! ## Related Modules
 //!
-//! * [Consensus](../paint_consensus/index.html)
-//! * [Democracy](../paint_democracy/index.html)
+//! * [Consensus](../palette_consensus/index.html)
+//! * [Democracy](../pallet_democracy/index.html)
 //!
 //! [`Call`]: ./enum.Call.html
 //! [`Trait`]: ./trait.Trait.html
diff --git a/substrate/paint/support/Cargo.toml b/substrate/palette/support/Cargo.toml
similarity index 84%
rename from substrate/paint/support/Cargo.toml
rename to substrate/palette/support/Cargo.toml
index 17f0ddebc9..2a098b6afa 100644
--- a/substrate/paint/support/Cargo.toml
+++ b/substrate/palette/support/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-support"
+name = "palette-support"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,13 +8,13 @@ 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"] }
-paint-metadata = { path = "../metadata", default-features = false }
+palette-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 }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-paint-support-procedural = { package = "paint-support-procedural", path = "./procedural" }
+palette-support-procedural = { package = "palette-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 }
@@ -23,7 +23,7 @@ impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
-paint-system = { path = "../system" }
+palette-system = { path = "../system" }
 
 [features]
 default = ["std"]
@@ -35,7 +35,7 @@ std = [
 	"codec/std",
 	"rstd/std",
 	"sr-primitives/std",
-	"paint-metadata/std",
+	"palette-metadata/std",
 	"inherents/std",
 	"state-machine",
 ]
diff --git a/substrate/paint/support/procedural/Cargo.toml b/substrate/palette/support/procedural/Cargo.toml
similarity index 62%
rename from substrate/paint/support/procedural/Cargo.toml
rename to substrate/palette/support/procedural/Cargo.toml
index 96839c7d1f..0f8a322504 100644
--- a/substrate/paint/support/procedural/Cargo.toml
+++ b/substrate/palette/support/procedural/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-support-procedural"
+name = "palette-support-procedural"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,7 +8,7 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-paint-support-procedural-tools = { package = "paint-support-procedural-tools", path = "./tools" }
+palette-support-procedural-tools = { package = "palette-support-procedural-tools", path = "./tools" }
 
 proc-macro2 = "1.0.6"
 quote = "1.0.2"
diff --git a/substrate/paint/support/procedural/src/lib.rs b/substrate/palette/support/procedural/src/lib.rs
similarity index 88%
rename from substrate/paint/support/procedural/src/lib.rs
rename to substrate/palette/support/procedural/src/lib.rs
index ee704617fe..4a12221490 100644
--- a/substrate/paint/support/procedural/src/lib.rs
+++ b/substrate/palette/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`](../paint_support/storage/trait.StorageValue.html) trait using the
-///   [`StorageValue generator`](../paint_support/storage/generator/trait.StorageValue.html).
+///   [`StorageValue`](../palette_support/storage/trait.StorageValue.html) trait using the
+///   [`StorageValue generator`](../palette_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`](../paint_support/storage/trait.StorageMap.html) trait using the
-///   [`StorageMap generator`](../paint_support/storage/generator/trait.StorageMap.html).
+///   [`StorageMap`](../palette_support/storage/trait.StorageMap.html) trait using the
+///   [`StorageMap generator`](../palette_support/storage/generator/trait.StorageMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
-///   [`Hashable`](../paint_support/trait.Hashable.html) trait.
+///   [`Hashable`](../palette_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`](../paint_support/storage/trait.StorageLinkedMap.html) trait using the
-///   [`StorageLinkedMap generator`](../paint_support/storage/generator/trait.StorageLinkedMap.html).
+///   [`StorageLinkedMap`](../palette_support/storage/trait.StorageLinkedMap.html) trait using the
+///   [`StorageLinkedMap generator`](../palette_support/storage/generator/trait.StorageLinkedMap.html).
 ///
 ///   `$hash` representing a choice of hashing algorithms available in the
-///   [`Hashable`](../paint_support/trait.Hashable.html) trait.
+///   [`Hashable`](../palette_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`](../paint_support/storage/trait.StorageDoubleMap.html) trait using the
-///   [`StorageDoubleMap generator`](../paint_support/storage/generator/trait.StorageDoubleMap.html).
+///   [`StorageDoubleMap`](../palette_support/storage/trait.StorageDoubleMap.html) trait using the
+///   [`StorageDoubleMap generator`](../palette_support/storage/generator/trait.StorageDoubleMap.html).
 ///
 ///   `$hash1` and `$hash2` representing choices of hashing algorithms available in the
-///   [`Hashable`](../paint_support/trait.Hashable.html) trait. They must be choosen with care, see
+///   [`Hashable`](../palette_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/paint/support/procedural/src/storage/genesis_config/builder_def.rs b/substrate/palette/support/procedural/src/storage/genesis_config/builder_def.rs
similarity index 98%
rename from substrate/paint/support/procedural/src/storage/genesis_config/builder_def.rs
rename to substrate/palette/support/procedural/src/storage/genesis_config/builder_def.rs
index 12694e1f06..99fb89bbe8 100644
--- a/substrate/paint/support/procedural/src/storage/genesis_config/builder_def.rs
+++ b/substrate/palette/support/procedural/src/storage/genesis_config/builder_def.rs
@@ -16,7 +16,7 @@
 
 //! Builder logic definition used to build genesis storage.
 
-use paint_support_procedural_tools::syn_ext as ext;
+use palette_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
 use syn::spanned::Spanned;
 use quote::{quote, quote_spanned};
diff --git a/substrate/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/substrate/palette/support/procedural/src/storage/genesis_config/genesis_config_def.rs
similarity index 98%
rename from substrate/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs
rename to substrate/palette/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index b63c2993b2..f4f7c98445 100644
--- a/substrate/paint/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/substrate/palette/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -16,7 +16,7 @@
 
 //! Genesis config defintion.
 
-use paint_support_procedural_tools::syn_ext as ext;
+use palette_support_procedural_tools::syn_ext as ext;
 use proc_macro2::TokenStream;
 use syn::{spanned::Spanned, parse_quote};
 use quote::quote;
diff --git a/substrate/paint/support/procedural/src/storage/genesis_config/mod.rs b/substrate/palette/support/procedural/src/storage/genesis_config/mod.rs
similarity index 100%
rename from substrate/paint/support/procedural/src/storage/genesis_config/mod.rs
rename to substrate/palette/support/procedural/src/storage/genesis_config/mod.rs
diff --git a/substrate/paint/support/procedural/src/storage/getters.rs b/substrate/palette/support/procedural/src/storage/getters.rs
similarity index 100%
rename from substrate/paint/support/procedural/src/storage/getters.rs
rename to substrate/palette/support/procedural/src/storage/getters.rs
diff --git a/substrate/paint/support/procedural/src/storage/instance_trait.rs b/substrate/palette/support/procedural/src/storage/instance_trait.rs
similarity index 100%
rename from substrate/paint/support/procedural/src/storage/instance_trait.rs
rename to substrate/palette/support/procedural/src/storage/instance_trait.rs
diff --git a/substrate/paint/support/procedural/src/storage/metadata.rs b/substrate/palette/support/procedural/src/storage/metadata.rs
similarity index 99%
rename from substrate/paint/support/procedural/src/storage/metadata.rs
rename to substrate/palette/support/procedural/src/storage/metadata.rs
index e02e02c3ce..4bba827c73 100644
--- a/substrate/paint/support/procedural/src/storage/metadata.rs
+++ b/substrate/palette/support/procedural/src/storage/metadata.rs
@@ -16,7 +16,7 @@
 
 //! Implementation of `storage_metadata` on module structure, used by construct_runtime.
 
-use paint_support_procedural_tools::clean_type_string;
+use palette_support_procedural_tools::clean_type_string;
 use proc_macro2::TokenStream;
 use quote::quote;
 use super::{DeclStorageDefExt, StorageLineDefExt, StorageLineTypeDef};
diff --git a/substrate/paint/support/procedural/src/storage/mod.rs b/substrate/palette/support/procedural/src/storage/mod.rs
similarity index 99%
rename from substrate/paint/support/procedural/src/storage/mod.rs
rename to substrate/palette/support/procedural/src/storage/mod.rs
index ca03f6d3d5..3520f309b9 100644
--- a/substrate/paint/support/procedural/src/storage/mod.rs
+++ b/substrate/palette/support/procedural/src/storage/mod.rs
@@ -25,7 +25,7 @@ mod instance_trait;
 mod genesis_config;
 
 use quote::quote;
-use paint_support_procedural_tools::{
+use palette_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, "paint-support");
-	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "paint-support");
+	let scrate = generate_crate_access(&hidden_crate_name, "palette-support");
+	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "palette-support");
 
 	let store_trait = store_trait::decl_and_impl(&def_ext);
 	let getters = getters::impl_getters(&scrate, &def_ext);
diff --git a/substrate/paint/support/procedural/src/storage/parse.rs b/substrate/palette/support/procedural/src/storage/parse.rs
similarity index 99%
rename from substrate/paint/support/procedural/src/storage/parse.rs
rename to substrate/palette/support/procedural/src/storage/parse.rs
index a680d5e9ee..975a758c21 100644
--- a/substrate/paint/support/procedural/src/storage/parse.rs
+++ b/substrate/palette/support/procedural/src/storage/parse.rs
@@ -16,7 +16,7 @@
 
 //! Parsing of decl_storage input.
 
-use paint_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
+use palette_support_procedural_tools::{ToTokens, Parse, syn_ext as ext};
 use syn::{Ident, Token, spanned::Spanned};
 
 mod keyword {
diff --git a/substrate/paint/support/procedural/src/storage/storage_struct.rs b/substrate/palette/support/procedural/src/storage/storage_struct.rs
similarity index 100%
rename from substrate/paint/support/procedural/src/storage/storage_struct.rs
rename to substrate/palette/support/procedural/src/storage/storage_struct.rs
diff --git a/substrate/paint/support/procedural/src/storage/store_trait.rs b/substrate/palette/support/procedural/src/storage/store_trait.rs
similarity index 100%
rename from substrate/paint/support/procedural/src/storage/store_trait.rs
rename to substrate/palette/support/procedural/src/storage/store_trait.rs
diff --git a/substrate/paint/support/procedural/tools/Cargo.toml b/substrate/palette/support/procedural/tools/Cargo.toml
similarity index 58%
rename from substrate/paint/support/procedural/tools/Cargo.toml
rename to substrate/palette/support/procedural/tools/Cargo.toml
index 7fb906b6ff..d037445023 100644
--- a/substrate/paint/support/procedural/tools/Cargo.toml
+++ b/substrate/palette/support/procedural/tools/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "paint-support-procedural-tools"
+name = "palette-support-procedural-tools"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
 
 [dependencies]
-paint-support-procedural-tools-derive = { package = "paint-support-procedural-tools-derive", path = "./derive" }
+palette-support-procedural-tools-derive = { package = "palette-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/paint/support/procedural/tools/derive/Cargo.toml b/substrate/palette/support/procedural/tools/derive/Cargo.toml
similarity index 86%
rename from substrate/paint/support/procedural/tools/derive/Cargo.toml
rename to substrate/palette/support/procedural/tools/derive/Cargo.toml
index 6b81ee829d..9ae8692b31 100644
--- a/substrate/paint/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/palette/support/procedural/tools/derive/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-support-procedural-tools-derive"
+name = "palette-support-procedural-tools-derive"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/paint/support/procedural/tools/derive/src/lib.rs b/substrate/palette/support/procedural/tools/derive/src/lib.rs
similarity index 100%
rename from substrate/paint/support/procedural/tools/derive/src/lib.rs
rename to substrate/palette/support/procedural/tools/derive/src/lib.rs
diff --git a/substrate/paint/support/procedural/tools/src/lib.rs b/substrate/palette/support/procedural/tools/src/lib.rs
similarity index 94%
rename from substrate/paint/support/procedural/tools/src/lib.rs
rename to substrate/palette/support/procedural/tools/src/lib.rs
index d76ef24f19..4a838c733d 100644
--- a/substrate/paint/support/procedural/tools/src/lib.rs
+++ b/substrate/palette/support/procedural/tools/src/lib.rs
@@ -19,7 +19,7 @@
 // end::description[]
 
 // reexport proc macros
-pub use paint_support_procedural_tools_derive::*;
+pub use palette_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 `paint-support` crate.
+/// Generates the access to the `palette-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!( paint_support )
+		quote::quote!( palette_support )
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
 		quote::quote!( self::#mod_name::hidden_include )
diff --git a/substrate/paint/support/procedural/tools/src/syn_ext.rs b/substrate/palette/support/procedural/tools/src/syn_ext.rs
similarity index 99%
rename from substrate/paint/support/procedural/tools/src/syn_ext.rs
rename to substrate/palette/support/procedural/tools/src/syn_ext.rs
index a3f6d52c4c..fc8385a91a 100644
--- a/substrate/paint/support/procedural/tools/src/syn_ext.rs
+++ b/substrate/palette/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 paint_support_procedural_tools_derive::{ToTokens, Parse};
+use palette_support_procedural_tools_derive::{ToTokens, Parse};
 
 /// stop parsing here getting remaining token as content
 /// Warn duplicate stream (part of)
diff --git a/substrate/paint/support/rpc/Cargo.toml b/substrate/palette/support/rpc/Cargo.toml
similarity index 81%
rename from substrate/paint/support/rpc/Cargo.toml
rename to substrate/palette/support/rpc/Cargo.toml
index 1753395010..c819cc4f5f 100644
--- a/substrate/paint/support/rpc/Cargo.toml
+++ b/substrate/palette/support/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-support-rpc"
+name = "palette-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"
-paint-support = { path = "../" }
+palette-support = { path = "../" }
 substrate-primitives-storage = { path = "../../../primitives/core/storage" }
 substrate-rpc-api = { path = "../../../client/rpc/api" }
 
 [dev-dependencies]
-paint-system = { path = "../../system" }
+palette-system = { path = "../../system" }
 tokio = "0.1"
diff --git a/substrate/paint/support/rpc/src/lib.rs b/substrate/palette/support/rpc/src/lib.rs
similarity index 90%
rename from substrate/paint/support/rpc/src/lib.rs
rename to substrate/palette/support/rpc/src/lib.rs
index a09fbd694c..70efc65883 100644
--- a/substrate/paint/support/rpc/src/lib.rs
+++ b/substrate/palette/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 [paint_support::storage::generator] traits
+//! Combines [substrate_rpc_api::state::StateClient] with [palette_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 paint_support::storage::generator::{
+use palette_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 paint_support::{decl_storage, decl_module};
-/// # use paint_support_rpc::StorageQuery;
-/// # use paint_system::Trait;
+/// # use palette_support::{decl_storage, decl_module};
+/// # use palette_support_rpc::StorageQuery;
+/// # use palette_system::Trait;
 /// # use substrate_rpc_api::state::StateClient;
 /// #
-/// # // Hash would normally be ::Hash, but we don't have
-/// # // paint_system::Trait implemented for TestRuntime. Here we just pretend.
+/// # // Hash would normally be ::Hash, but we don't have
+/// # // palette_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/paint/support/src/debug.rs b/substrate/palette/support/src/debug.rs
similarity index 97%
rename from substrate/paint/support/src/debug.rs
rename to substrate/palette/support/src/debug.rs
index 8904d3defe..3953ae6335 100644
--- a/substrate/paint/support/src/debug.rs
+++ b/substrate/palette/support/src/debug.rs
@@ -35,7 +35,7 @@
 //! that WASM debug formatting of structs will be empty.
 //!
 //! ```rust,no_run
-//!	use paint_support::debug;
+//!	use palette_support::debug;
 //!
 //! #[derive(primitives::RuntimeDebug)]
 //!	struct MyStruct {
@@ -66,7 +66,7 @@
 //! logs conditionally and strips out logs in WASM.
 //!
 //! ```rust,no_run
-//!	use paint_support::debug::native;
+//!	use palette_support::debug::native;
 //!
 //! #[derive(primitives::RuntimeDebug)]
 //!	struct MyStruct {
@@ -124,7 +124,7 @@ pub mod native {
 /// # Example
 ///
 /// ```
-/// paint_support::runtime_print!("my value is {}", 3);
+/// palette_support::runtime_print!("my value is {}", 3);
 /// ```
 #[macro_export]
 macro_rules! runtime_print {
diff --git a/substrate/paint/support/src/dispatch.rs b/substrate/palette/support/src/dispatch.rs
similarity index 98%
rename from substrate/paint/support/src/dispatch.rs
rename to substrate/palette/support/src/dispatch.rs
index d985ce80cd..d8d2391734 100644
--- a/substrate/paint/support/src/dispatch.rs
+++ b/substrate/palette/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 paint_metadata::{
+pub use palette_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 paint_support;
-/// # use paint_support::dispatch::Result;
-/// # use paint_system::{self as system, Trait, ensure_signed};
+/// # extern crate palette_support;
+/// # use palette_support::dispatch::Result;
+/// # use palette_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 paint_support;
-/// # use paint_support::dispatch::Result;
-/// # use paint_system::{self as system, Trait, ensure_signed};
+/// # extern crate palette_support;
+/// # use palette_support::dispatch::Result;
+/// # use palette_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 paint_support;
-/// # use paint_support::dispatch::Result;
-/// # use paint_system::{self as system, Trait, ensure_signed, ensure_root};
+/// # extern crate palette_support;
+/// # use palette_support::dispatch::Result;
+/// # use palette_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 {
@@ -140,15 +140,15 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// ## Multiple Module Instances Example
 ///
 /// A Substrate module can be built such that multiple instances of the same module can be used within a single
-/// runtime. For example, the [Balances module](../paint_balances/index.html) can be added multiple times to your
+/// runtime. For example, the [Balances module](../pallet_balances/index.html) can be added multiple times to your
 /// runtime in order to support multiple, independent currencies for your blockchain. Here is an example of how
 /// you would declare such a module using the `decl_module!` macro:
 ///
 /// ```
 /// # #[macro_use]
-/// # extern crate paint_support;
-/// # use paint_support::dispatch::Result;
-/// # use paint_system::{self as system, ensure_signed};
+/// # extern crate palette_support;
+/// # use palette_support::dispatch::Result;
+/// # use palette_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 paint_support;
-/// # use paint_support::dispatch::Result;
-/// # use paint_system::{self as system, ensure_signed};
+/// # extern crate palette_support;
+/// # use palette_support::dispatch::Result;
+/// # use palette_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](../paint_system/index.html).
+/// The default behavior is to call `deposit_event` from the [System module](../palette_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/paint/support/src/error.rs b/substrate/palette/support/src/error.rs
similarity index 97%
rename from substrate/paint/support/src/error.rs
rename to substrate/palette/support/src/error.rs
index 4b2e0a232d..b717876dba 100644
--- a/substrate/paint/support/src/error.rs
+++ b/substrate/palette/support/src/error.rs
@@ -18,7 +18,7 @@
 
 #[doc(hidden)]
 pub use sr_primitives::traits::LookupError;
-pub use paint_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
+pub use palette_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 
 /// Declare an error type for a runtime module.
 ///
@@ -31,7 +31,7 @@ pub use paint_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 /// # Usage
 ///
 /// ```
-/// # use paint_support::decl_error;
+/// # use palette_support::decl_error;
 /// decl_error! {
 ///     /// Errors that can occur in my module.
 ///     pub enum MyError {
diff --git a/substrate/paint/support/src/event.rs b/substrate/palette/support/src/event.rs
similarity index 98%
rename from substrate/paint/support/src/event.rs
rename to substrate/palette/support/src/event.rs
index 139db1f609..edd95148c4 100644
--- a/substrate/paint/support/src/event.rs
+++ b/substrate/palette/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 paint_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
+pub use palette_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnEncode};
 
 /// Implement the `Event` for a module.
 ///
 /// # Simple Event Example:
 ///
 /// ```rust
-/// paint_support::decl_event!(
+/// palette_support::decl_event!(
 ///    pub enum Event {
 ///       Success,
 ///       Failure(String),
@@ -44,7 +44,7 @@ pub use paint_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///
 /// mod event1 {
 ///     // Event that specifies the generic parameter explicitly (`Balance`).
-///     paint_support::decl_event!(
+///     palette_support::decl_event!(
 ///        pub enum Event where Balance = ::Balance {
 ///           Message(Balance),
 ///        }
@@ -55,7 +55,7 @@ pub use paint_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///     // 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.
-///     paint_support::decl_event!(
+///     palette_support::decl_event!(
 ///        pub enum Event where ::Balance {
 ///           Message(Balance),
 ///        }
@@ -64,7 +64,7 @@ pub use paint_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///
 /// mod event3 {
 ///     // And we even support declaring multiple generic parameters!
-///     paint_support::decl_event!(
+///     palette_support::decl_event!(
 ///        pub enum Event where ::Balance, ::Token {
 ///           Message(Balance, Token),
 ///        }
@@ -88,7 +88,7 @@ pub use paint_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// }
 ///
 /// // For module with instances, DefaultInstance is optional
-/// paint_support::decl_event!(
+/// palette_support::decl_event!(
 ///    pub enum Event where
 ///       ::Balance,
 ///       ::Token
diff --git a/substrate/paint/support/src/hash.rs b/substrate/palette/support/src/hash.rs
similarity index 97%
rename from substrate/paint/support/src/hash.rs
rename to substrate/palette/support/src/hash.rs
index 122fefab70..7fcb007854 100644
--- a/substrate/paint/support/src/hash.rs
+++ b/substrate/palette/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 paint-support-procedural HasherKind usage
+// This trait must be kept coherent with palette-support-procedural HasherKind usage
 pub trait Hashable: Sized {
 	fn blake2_128(&self) -> [u8; 16];
 	fn blake2_256(&self) -> [u8; 32];
diff --git a/substrate/paint/support/src/inherent.rs b/substrate/palette/support/src/inherent.rs
similarity index 100%
rename from substrate/paint/support/src/inherent.rs
rename to substrate/palette/support/src/inherent.rs
diff --git a/substrate/paint/support/src/lib.rs b/substrate/palette/support/src/lib.rs
similarity index 98%
rename from substrate/paint/support/src/lib.rs
rename to substrate/palette/support/src/lib.rs
index 37dd2b4f9d..04b4a1e891 100644
--- a/substrate/paint/support/src/lib.rs
+++ b/substrate/palette/support/src/lib.rs
@@ -18,8 +18,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-/// Export ourself as `paint_support` to make tests happy.
-extern crate self as paint_support;
+/// Export ourself as `palette_support` to make tests happy.
+extern crate self as palette_support;
 
 #[macro_use]
 extern crate bitmask;
@@ -113,7 +113,7 @@ macro_rules! parameter_types {
 }
 
 #[doc(inline)]
-pub use paint_support_procedural::decl_storage;
+pub use palette_support_procedural::decl_storage;
 
 /// Return Err of the expression: `return Err($expression);`.
 ///
@@ -190,8 +190,8 @@ macro_rules! assert_ok {
 ///
 /// ```rust
 /// #[macro_use]
-/// # extern crate paint_support;
-/// # use paint_support::{assert_eq_uvec};
+/// # extern crate palette_support;
+/// # use palette_support::{assert_eq_uvec};
 /// # fn main() {
 /// assert_eq_uvec!(vec![1,2], vec![2,1]);
 /// # }
@@ -199,8 +199,8 @@ macro_rules! assert_ok {
 ///
 /// ```rust,should_panic
 /// #[macro_use]
-/// # extern crate paint_support;
-/// # use paint_support::{assert_eq_uvec};
+/// # extern crate palette_support;
+/// # use palette_support::{assert_eq_uvec};
 /// # fn main() {
 /// assert_eq_uvec!(vec![1,2,3], vec![2,1]);
 /// # }
@@ -238,7 +238,7 @@ pub use serde::{Serialize, Deserialize};
 mod tests {
 	use super::*;
 	use codec::{Codec, EncodeLike};
-	use paint_metadata::{
+	use palette_metadata::{
 		DecodeDifferent, StorageEntryMetadata, StorageMetadata, StorageEntryType,
 		StorageEntryModifier, DefaultByteGetter, StorageHasher,
 	};
diff --git a/substrate/paint/support/src/metadata.rs b/substrate/palette/support/src/metadata.rs
similarity index 98%
rename from substrate/paint/support/src/metadata.rs
rename to substrate/palette/support/src/metadata.rs
index f55cddea99..7579f0eed5 100644
--- a/substrate/paint/support/src/metadata.rs
+++ b/substrate/palette/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 paint_metadata::{
+pub use palette_metadata::{
 	DecodeDifferent, FnEncode, RuntimeMetadata, ModuleMetadata, RuntimeMetadataLastVersion,
 	DefaultByteGetter, RuntimeMetadataPrefixed, StorageEntryMetadata, StorageMetadata,
 	StorageEntryType, StorageEntryModifier, DefaultByte, StorageHasher, ModuleErrorMetadata
@@ -29,11 +29,11 @@ pub use paint_metadata::{
 ///#        type Origin;
 ///#        type BlockNumber;
 ///#    }
-///#    paint_support::decl_module! {
+///#    palette_support::decl_module! {
 ///#        pub struct Module for enum Call where origin: T::Origin {}
 ///#    }
 ///#
-///#    paint_support::decl_storage! {
+///#    palette_support::decl_storage! {
 ///#        trait Store for Module as TestStorage {}
 ///#    }
 ///# }
@@ -45,7 +45,7 @@ pub use paint_metadata::{
 ///# }
 ///
 /// struct Runtime;
-/// paint_support::impl_runtime_metadata! {
+/// palette_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 paint_metadata::{
+	use palette_metadata::{
 		EventMetadata, StorageEntryModifier, StorageEntryType, FunctionMetadata, StorageEntryMetadata,
 		ModuleMetadata, RuntimeMetadataPrefixed, DefaultByte, ModuleConstantMetadata, DefaultByteGetter,
 		ErrorMetadata,
diff --git a/substrate/paint/support/src/origin.rs b/substrate/palette/support/src/origin.rs
similarity index 100%
rename from substrate/paint/support/src/origin.rs
rename to substrate/palette/support/src/origin.rs
diff --git a/substrate/paint/support/src/runtime.rs b/substrate/palette/support/src/runtime.rs
similarity index 100%
rename from substrate/paint/support/src/runtime.rs
rename to substrate/palette/support/src/runtime.rs
diff --git a/substrate/paint/support/src/storage/child.rs b/substrate/palette/support/src/storage/child.rs
similarity index 100%
rename from substrate/paint/support/src/storage/child.rs
rename to substrate/palette/support/src/storage/child.rs
diff --git a/substrate/paint/support/src/storage/generator/double_map.rs b/substrate/palette/support/src/storage/generator/double_map.rs
similarity index 100%
rename from substrate/paint/support/src/storage/generator/double_map.rs
rename to substrate/palette/support/src/storage/generator/double_map.rs
diff --git a/substrate/paint/support/src/storage/generator/linked_map.rs b/substrate/palette/support/src/storage/generator/linked_map.rs
similarity index 100%
rename from substrate/paint/support/src/storage/generator/linked_map.rs
rename to substrate/palette/support/src/storage/generator/linked_map.rs
diff --git a/substrate/paint/support/src/storage/generator/map.rs b/substrate/palette/support/src/storage/generator/map.rs
similarity index 100%
rename from substrate/paint/support/src/storage/generator/map.rs
rename to substrate/palette/support/src/storage/generator/map.rs
diff --git a/substrate/paint/support/src/storage/generator/mod.rs b/substrate/palette/support/src/storage/generator/mod.rs
similarity index 100%
rename from substrate/paint/support/src/storage/generator/mod.rs
rename to substrate/palette/support/src/storage/generator/mod.rs
diff --git a/substrate/paint/support/src/storage/generator/value.rs b/substrate/palette/support/src/storage/generator/value.rs
similarity index 100%
rename from substrate/paint/support/src/storage/generator/value.rs
rename to substrate/palette/support/src/storage/generator/value.rs
diff --git a/substrate/paint/support/src/storage/hashed.rs b/substrate/palette/support/src/storage/hashed.rs
similarity index 100%
rename from substrate/paint/support/src/storage/hashed.rs
rename to substrate/palette/support/src/storage/hashed.rs
diff --git a/substrate/paint/support/src/storage/mod.rs b/substrate/palette/support/src/storage/mod.rs
similarity index 100%
rename from substrate/paint/support/src/storage/mod.rs
rename to substrate/palette/support/src/storage/mod.rs
diff --git a/substrate/paint/support/src/storage/unhashed.rs b/substrate/palette/support/src/storage/unhashed.rs
similarity index 100%
rename from substrate/paint/support/src/storage/unhashed.rs
rename to substrate/palette/support/src/storage/unhashed.rs
diff --git a/substrate/paint/support/src/traits.rs b/substrate/palette/support/src/traits.rs
similarity index 99%
rename from substrate/paint/support/src/traits.rs
rename to substrate/palette/support/src/traits.rs
index b723860739..afdfdfdf68 100644
--- a/substrate/paint/support/src/traits.rs
+++ b/substrate/palette/support/src/traits.rs
@@ -631,7 +631,7 @@ impl WithdrawReasons {
 	/// Choose all variants except for `one`.
 	///
 	/// ```rust
-	/// # use paint_support::traits::{WithdrawReason, WithdrawReasons};
+	/// # use palette_support::traits::{WithdrawReason, WithdrawReasons};
 	/// # fn main() {
 	/// assert_eq!(
 	/// 	WithdrawReason::Fee | WithdrawReason::Transfer | WithdrawReason::Reserve | WithdrawReason::Tip,
diff --git a/substrate/paint/support/src/unsigned.rs b/substrate/palette/support/src/unsigned.rs
similarity index 94%
rename from substrate/paint/support/src/unsigned.rs
rename to substrate/palette/support/src/unsigned.rs
index 690ea49471..02bafd9340 100644
--- a/substrate/paint/support/src/unsigned.rs
+++ b/substrate/palette/support/src/unsigned.rs
@@ -32,10 +32,10 @@ pub use crate::sr_primitives::ApplyError;
 /// # mod timestamp {
 /// # 	pub struct Module;
 /// #
-/// # 	impl paint_support::unsigned::ValidateUnsigned for Module {
+/// # 	impl palette_support::unsigned::ValidateUnsigned for Module {
 /// # 		type Call = Call;
 /// #
-/// # 		fn validate_unsigned(call: &Self::Call) -> paint_support::unsigned::TransactionValidity {
+/// # 		fn validate_unsigned(call: &Self::Call) -> palette_support::unsigned::TransactionValidity {
 /// # 			unimplemented!();
 /// # 		}
 /// # 	}
@@ -53,7 +53,7 @@ pub use crate::sr_primitives::ApplyError;
 /// # #[allow(unused)]
 /// pub struct Runtime;
 ///
-/// paint_support::impl_outer_validate_unsigned! {
+/// palette_support::impl_outer_validate_unsigned! {
 /// 	impl ValidateUnsigned for Runtime {
 /// 		Timestamp
 /// 	}
diff --git a/substrate/paint/support/test/Cargo.toml b/substrate/palette/support/test/Cargo.toml
similarity index 89%
rename from substrate/paint/support/test/Cargo.toml
rename to substrate/palette/support/test/Cargo.toml
index 19ed735660..223a425c80 100644
--- a/substrate/paint/support/test/Cargo.toml
+++ b/substrate/palette/support/test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-support-test"
+name = "palette-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 = "paint-support", version = "2", path = "../", default-features = false }
+support = { package = "palette-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/paint/support/test/src/lib.rs b/substrate/palette/support/test/src/lib.rs
similarity index 90%
rename from substrate/paint/support/test/src/lib.rs
rename to substrate/palette/support/test/src/lib.rs
index fa5c8cf1ea..d79ad7d0d0 100644
--- a/substrate/paint/support/test/src/lib.rs
+++ b/substrate/palette/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 paint_support. Allow to make use of `support::decl_storage`.
+//! Test crate for palette_support. Allow to make use of `support::decl_storage`.
 //! See tests directory.
diff --git a/substrate/paint/support/test/tests/decl_storage.rs b/substrate/palette/support/test/tests/decl_storage.rs
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage.rs
rename to substrate/palette/support/test/tests/decl_storage.rs
diff --git a/substrate/paint/support/test/tests/decl_storage_ui.rs b/substrate/palette/support/test/tests/decl_storage_ui.rs
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui.rs
rename to substrate/palette/support/test/tests/decl_storage_ui.rs
diff --git a/substrate/paint/support/test/tests/decl_storage_ui/config_duplicate.rs b/substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.rs
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui/config_duplicate.rs
rename to substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.rs
diff --git a/substrate/paint/support/test/tests/decl_storage_ui/config_duplicate.stderr b/substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.stderr
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui/config_duplicate.stderr
rename to substrate/palette/support/test/tests/decl_storage_ui/config_duplicate.stderr
diff --git a/substrate/paint/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.rs
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui/config_get_duplicate.rs
rename to substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.rs
diff --git a/substrate/paint/support/test/tests/decl_storage_ui/config_get_duplicate.stderr b/substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
rename to substrate/palette/support/test/tests/decl_storage_ui/config_get_duplicate.stderr
diff --git a/substrate/paint/support/test/tests/decl_storage_ui/get_duplicate.rs b/substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.rs
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui/get_duplicate.rs
rename to substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.rs
diff --git a/substrate/paint/support/test/tests/decl_storage_ui/get_duplicate.stderr b/substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.stderr
similarity index 100%
rename from substrate/paint/support/test/tests/decl_storage_ui/get_duplicate.stderr
rename to substrate/palette/support/test/tests/decl_storage_ui/get_duplicate.stderr
diff --git a/substrate/paint/support/test/tests/final_keys.rs b/substrate/palette/support/test/tests/final_keys.rs
similarity index 100%
rename from substrate/paint/support/test/tests/final_keys.rs
rename to substrate/palette/support/test/tests/final_keys.rs
diff --git a/substrate/paint/support/test/tests/genesisconfig.rs b/substrate/palette/support/test/tests/genesisconfig.rs
similarity index 100%
rename from substrate/paint/support/test/tests/genesisconfig.rs
rename to substrate/palette/support/test/tests/genesisconfig.rs
diff --git a/substrate/paint/support/test/tests/instance.rs b/substrate/palette/support/test/tests/instance.rs
similarity index 100%
rename from substrate/paint/support/test/tests/instance.rs
rename to substrate/palette/support/test/tests/instance.rs
diff --git a/substrate/paint/support/test/tests/issue2219.rs b/substrate/palette/support/test/tests/issue2219.rs
similarity index 100%
rename from substrate/paint/support/test/tests/issue2219.rs
rename to substrate/palette/support/test/tests/issue2219.rs
diff --git a/substrate/paint/support/test/tests/reserved_keyword.rs b/substrate/palette/support/test/tests/reserved_keyword.rs
similarity index 100%
rename from substrate/paint/support/test/tests/reserved_keyword.rs
rename to substrate/palette/support/test/tests/reserved_keyword.rs
diff --git a/substrate/paint/support/test/tests/reserved_keyword/on_initialize.rs b/substrate/palette/support/test/tests/reserved_keyword/on_initialize.rs
similarity index 100%
rename from substrate/paint/support/test/tests/reserved_keyword/on_initialize.rs
rename to substrate/palette/support/test/tests/reserved_keyword/on_initialize.rs
diff --git a/substrate/paint/support/test/tests/reserved_keyword/on_initialize.stderr b/substrate/palette/support/test/tests/reserved_keyword/on_initialize.stderr
similarity index 100%
rename from substrate/paint/support/test/tests/reserved_keyword/on_initialize.stderr
rename to substrate/palette/support/test/tests/reserved_keyword/on_initialize.stderr
diff --git a/substrate/paint/support/test/tests/system.rs b/substrate/palette/support/test/tests/system.rs
similarity index 100%
rename from substrate/paint/support/test/tests/system.rs
rename to substrate/palette/support/test/tests/system.rs
diff --git a/substrate/paint/system/Cargo.toml b/substrate/palette/system/Cargo.toml
similarity index 90%
rename from substrate/paint/system/Cargo.toml
rename to substrate/palette/system/Cargo.toml
index 9fa98937b9..603375a6b6 100644
--- a/substrate/paint/system/Cargo.toml
+++ b/substrate/palette/system/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-system"
+name = "palette-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 = "paint-support", path = "../support", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
diff --git a/substrate/paint/system/benches/bench.rs b/substrate/palette/system/benches/bench.rs
similarity index 98%
rename from substrate/paint/system/benches/bench.rs
rename to substrate/palette/system/benches/bench.rs
index 2ff794521d..ed4b208e93 100644
--- a/substrate/paint/system/benches/bench.rs
+++ b/substrate/palette/system/benches/bench.rs
@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see .
 
 use criterion::{Criterion, criterion_group, criterion_main, black_box};
-use paint_system as system;
+use palette_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/paint/system/rpc/Cargo.toml b/substrate/palette/system/rpc/Cargo.toml
similarity index 90%
rename from substrate/paint/system/rpc/Cargo.toml
rename to substrate/palette/system/rpc/Cargo.toml
index 6f71b9af51..1f43db9ea2 100644
--- a/substrate/paint/system/rpc/Cargo.toml
+++ b/substrate/palette/system/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-system-rpc"
+name = "palette-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" }
-paint-system-rpc-runtime-api = { path = "./runtime-api" }
+palette-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/paint/system/rpc/runtime-api/Cargo.toml b/substrate/palette/system/rpc/runtime-api/Cargo.toml
similarity index 89%
rename from substrate/paint/system/rpc/runtime-api/Cargo.toml
rename to substrate/palette/system/rpc/runtime-api/Cargo.toml
index e0e90e7965..f05d0359df 100644
--- a/substrate/paint/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/palette/system/rpc/runtime-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-system-rpc-runtime-api"
+name = "palette-system-rpc-runtime-api"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/paint/system/rpc/runtime-api/src/lib.rs b/substrate/palette/system/rpc/runtime-api/src/lib.rs
similarity index 100%
rename from substrate/paint/system/rpc/runtime-api/src/lib.rs
rename to substrate/palette/system/rpc/runtime-api/src/lib.rs
diff --git a/substrate/paint/system/rpc/src/lib.rs b/substrate/palette/system/rpc/src/lib.rs
similarity index 98%
rename from substrate/paint/system/rpc/src/lib.rs
rename to substrate/palette/system/rpc/src/lib.rs
index e89e9b7592..5bce6aaa43 100644
--- a/substrate/paint/system/rpc/src/lib.rs
+++ b/substrate/palette/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 paint_system_rpc_runtime_api::AccountNonceApi;
+pub use palette_system_rpc_runtime_api::AccountNonceApi;
 pub use self::gen_client::Client as SystemClient;
 
 /// System RPC methods.
diff --git a/substrate/paint/system/src/lib.rs b/substrate/palette/system/src/lib.rs
similarity index 99%
rename from substrate/paint/system/src/lib.rs
rename to substrate/palette/system/src/lib.rs
index 9a4bf2297a..51b7820a43 100644
--- a/substrate/paint/system/src/lib.rs
+++ b/substrate/palette/system/src/lib.rs
@@ -69,7 +69,7 @@
 //!
 //! ```
 //! use support::{decl_module, dispatch::Result};
-//! use paint_system::{self as system, ensure_signed};
+//! use palette_system::{self as system, ensure_signed};
 //!
 //! pub trait Trait: system::Trait {}
 //!
diff --git a/substrate/paint/system/src/offchain.rs b/substrate/palette/system/src/offchain.rs
similarity index 100%
rename from substrate/paint/system/src/offchain.rs
rename to substrate/palette/system/src/offchain.rs
diff --git a/substrate/paint/timestamp/Cargo.toml b/substrate/palette/timestamp/Cargo.toml
similarity index 83%
rename from substrate/paint/timestamp/Cargo.toml
rename to substrate/palette/timestamp/Cargo.toml
index 5c9828e36d..6268e9161c 100644
--- a/substrate/paint/timestamp/Cargo.toml
+++ b/substrate/palette/timestamp/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-timestamp"
+name = "pallet-timestamp"
 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 }
 sr-primitives = { path = "../../primitives/sr-primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
-support = { package = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-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/paint/timestamp/src/lib.rs b/substrate/palette/timestamp/src/lib.rs
similarity index 98%
rename from substrate/paint/timestamp/src/lib.rs
rename to substrate/palette/timestamp/src/lib.rs
index 3aa921626e..52e3081c2a 100644
--- a/substrate/paint/timestamp/src/lib.rs
+++ b/substrate/palette/timestamp/src/lib.rs
@@ -62,7 +62,7 @@
 //!
 //! ```
 //! use support::{decl_module, dispatch::Result};
-//! # use paint_timestamp as timestamp;
+//! # use pallet_timestamp as timestamp;
 //! use system::ensure_signed;
 //!
 //! pub trait Trait: timestamp::Trait {}
@@ -81,12 +81,12 @@
 //!
 //! ### Example from the SRML
 //!
-//! The [Session module](https://github.com/paritytech/substrate/blob/master/paint/session/src/lib.rs) uses
+//! The [Session module](https://github.com/paritytech/substrate/blob/master/palette/session/src/lib.rs) uses
 //! the Timestamp module for session management.
 //!
 //! ## Related Modules
 //!
-//! * [Session](../paint_session/index.html)
+//! * [Session](../pallet_session/index.html)
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/substrate/paint/transaction-payment/Cargo.toml b/substrate/palette/transaction-payment/Cargo.toml
similarity index 67%
rename from substrate/paint/transaction-payment/Cargo.toml
rename to substrate/palette/transaction-payment/Cargo.toml
index 535df1ed95..171713efa3 100644
--- a/substrate/paint/transaction-payment/Cargo.toml
+++ b/substrate/palette/transaction-payment/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-transaction-payment"
+name = "pallet-transaction-payment"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -8,14 +8,14 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
-transaction-payment-rpc-runtime-api = { package = "paint-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-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]
 runtime-io = { package = "sr-io", path = "../../primitives/sr-io" }
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "paint-balances", path = "../balances" }
+balances = { package = "pallet-balances", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/substrate/paint/transaction-payment/rpc/Cargo.toml b/substrate/palette/transaction-payment/rpc/Cargo.toml
similarity index 84%
rename from substrate/paint/transaction-payment/rpc/Cargo.toml
rename to substrate/palette/transaction-payment/rpc/Cargo.toml
index 22d68f8a6c..92bbda3220 100644
--- a/substrate/paint/transaction-payment/rpc/Cargo.toml
+++ b/substrate/palette/transaction-payment/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-transaction-payment-rpc"
+name = "pallet-transaction-payment-rpc"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -14,4 +14,4 @@ primitives = { package = "substrate-primitives",  path = "../../../primitives/co
 rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
 sr-primitives = { path = "../../../primitives/sr-primitives" }
-paint-transaction-payment-rpc-runtime-api = { path = "./runtime-api" }
+pallet-transaction-payment-rpc-runtime-api = { path = "./runtime-api" }
diff --git a/substrate/paint/transaction-payment/rpc/runtime-api/Cargo.toml b/substrate/palette/transaction-payment/rpc/runtime-api/Cargo.toml
similarity index 93%
rename from substrate/paint/transaction-payment/rpc/runtime-api/Cargo.toml
rename to substrate/palette/transaction-payment/rpc/runtime-api/Cargo.toml
index e6eac75de8..e61846d74e 100644
--- a/substrate/paint/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/substrate/palette/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-transaction-payment-rpc-runtime-api"
+name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
diff --git a/substrate/paint/transaction-payment/rpc/runtime-api/src/lib.rs b/substrate/palette/transaction-payment/rpc/runtime-api/src/lib.rs
similarity index 100%
rename from substrate/paint/transaction-payment/rpc/runtime-api/src/lib.rs
rename to substrate/palette/transaction-payment/rpc/runtime-api/src/lib.rs
diff --git a/substrate/paint/transaction-payment/rpc/src/lib.rs b/substrate/palette/transaction-payment/rpc/src/lib.rs
similarity index 94%
rename from substrate/paint/transaction-payment/rpc/src/lib.rs
rename to substrate/palette/transaction-payment/rpc/src/lib.rs
index 8b59263b57..54ec16f032 100644
--- a/substrate/paint/transaction-payment/rpc/src/lib.rs
+++ b/substrate/palette/transaction-payment/rpc/src/lib.rs
@@ -26,8 +26,8 @@ use sr_primitives::{
 	traits::{Block as BlockT, ProvideRuntimeApi},
 };
 use primitives::Bytes;
-use paint_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-pub use paint_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
+use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
+pub use pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
 pub use self::gen_client::Client as TransactionPaymentClient;
 
 #[rpc]
diff --git a/substrate/paint/transaction-payment/src/lib.rs b/substrate/palette/transaction-payment/src/lib.rs
similarity index 100%
rename from substrate/paint/transaction-payment/src/lib.rs
rename to substrate/palette/transaction-payment/src/lib.rs
diff --git a/substrate/paint/treasury/Cargo.toml b/substrate/palette/treasury/Cargo.toml
similarity index 73%
rename from substrate/paint/treasury/Cargo.toml
rename to substrate/palette/treasury/Cargo.toml
index 7f917fb22e..e714bf3f5f 100644
--- a/substrate/paint/treasury/Cargo.toml
+++ b/substrate/palette/treasury/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-treasury"
+name = "pallet-treasury"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -9,9 +9,9 @@ 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 = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
-balances = { package = "paint-balances", path = "../balances", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-system", path = "../system", default-features = false }
+balances = { package = "pallet-balances", path = "../balances", default-features = false }
 
 [dev-dependencies]
 runtime-io ={ package = "sr-io", path = "../../primitives/sr-io" }
diff --git a/substrate/paint/treasury/src/lib.rs b/substrate/palette/treasury/src/lib.rs
similarity index 100%
rename from substrate/paint/treasury/src/lib.rs
rename to substrate/palette/treasury/src/lib.rs
diff --git a/substrate/paint/utility/Cargo.toml b/substrate/palette/utility/Cargo.toml
similarity index 74%
rename from substrate/paint/utility/Cargo.toml
rename to substrate/palette/utility/Cargo.toml
index 1415c3e922..34dd33f43e 100644
--- a/substrate/paint/utility/Cargo.toml
+++ b/substrate/palette/utility/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paint-utility"
+name = "palette-utility"
 version = "2.0.0"
 authors = ["Parity Technologies "]
 edition = "2018"
@@ -7,15 +7,15 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-support = { package = "paint-support", path = "../support", default-features = false }
-system = { package = "paint-system", path = "../system", default-features = false }
+support = { package = "palette-support", path = "../support", default-features = false }
+system = { package = "palette-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 }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../primitives/core" }
-balances = { package = "paint-balances", path = "../balances" }
+balances = { package = "pallet-balances", path = "../balances" }
 
 [features]
 default = ["std"]
diff --git a/substrate/paint/utility/src/lib.rs b/substrate/palette/utility/src/lib.rs
similarity index 100%
rename from substrate/paint/utility/src/lib.rs
rename to substrate/palette/utility/src/lib.rs
diff --git a/substrate/primitives/phragmen/Cargo.toml b/substrate/primitives/phragmen/Cargo.toml
index 250a09dd34..b2138434b6 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 = "paint-support", path = "../../paint/support" }
+support = { package = "palette-support", path = "../../palette/support" }
 rand = "0.7.2"
 
 [features]
diff --git a/substrate/test/utils/primitives/Cargo.toml b/substrate/test/utils/primitives/Cargo.toml
index b3d200f95d..a357ce42f6 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 = "paint-support", path = "../../../paint/support", default-features = false }
+# runtime_support = { package = "palette-support", path = "../../../palette/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 }
-# paint-babe = { path = "../../../paint/babe", default-features = false }
-# paint-system = { path = "../../../paint/system", default-features = false }
-# paint-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false }
-# paint-timestamp = { path = "../../../paint/timestamp", 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 }
 # 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 }
@@ -60,10 +60,10 @@ std = [
 	# "session/std",
 	# "sr-api/std",
 	# "sr-primitives/std",
-	# "paint-babe/std",
-	# "paint-system-rpc-runtime-api/std",
-	# "paint-system/std",
-	# "paint-timestamp/std",
+	# "pallet-babe/std",
+	# "palette-system-rpc-runtime-api/std",
+	# "palette-system/std",
+	# "pallet-timestamp/std",
 	# "substrate-client",
 	# "substrate-trie/std",
 	# "transaction-pool-api/std",
diff --git a/substrate/test/utils/runtime/Cargo.toml b/substrate/test/utils/runtime/Cargo.toml
index c405451fa8..4caba58301 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 = "paint-executive", path = "../../../paint/executive", default-features = false }
+executive = { package = "palette-executive", path = "../../../palette/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 = "paint-support", path = "../../../paint/support", default-features = false }
+runtime_support = { package = "palette-support", path = "../../../palette/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 }
-paint-babe = { path = "../../../paint/babe", default-features = false }
-paint-system = { path = "../../../paint/system", default-features = false }
-paint-system-rpc-runtime-api = { path = "../../../paint/system/rpc/runtime-api", default-features = false }
-paint-timestamp = { path = "../../../paint/timestamp", 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 }
 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 }
@@ -72,10 +72,10 @@ std = [
 	"session/std",
 	"sr-api/std",
 	"sr-primitives/std",
-	"paint-babe/std",
-	"paint-system-rpc-runtime-api/std",
-	"paint-system/std",
-	"paint-timestamp/std",
+	"pallet-babe/std",
+	"palette-system-rpc-runtime-api/std",
+	"palette-system/std",
+	"pallet-timestamp/std",
 	"substrate-client",
 	"substrate-trie/std",
 	"transaction-pool-api/std",
diff --git a/substrate/test/utils/runtime/src/lib.rs b/substrate/test/utils/runtime/src/lib.rs
index 2ec1099388..b64d47d886 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 = paint_system {}
+	pub enum Origin for Runtime where system = palette_system {}
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug)]
 pub struct Event;
 
-impl From for Event {
-	fn from(_evt: paint_system::Event) -> Self {
+impl From for Event {
+	fn from(_evt: palette_system::Event) -> Self {
 		unimplemented!("Not required in tests!")
 	}
 }
@@ -358,7 +358,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl paint_system::Trait for Runtime {
+impl palette_system::Trait for Runtime {
 	type Origin = Origin;
 	type Call = Extrinsic;
 	type Index = u64;
@@ -376,7 +376,7 @@ impl paint_system::Trait for Runtime {
 	type Version = ();
 }
 
-impl paint_timestamp::Trait for Runtime {
+impl pallet_timestamp::Trait for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -388,13 +388,13 @@ parameter_types! {
 	pub const ExpectedBlockTime: u64 = 10_000;
 }
 
-impl paint_babe::Trait for Runtime {
+impl pallet_babe::Trait for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	// there is no actual runtime in this test-runtime, so testing crates
 	// are manually adding the digests. normally in this situation you'd use
-	// paint_babe::SameAuthoritiesForever.
-	type EpochChangeTrigger = paint_babe::ExternalTrigger;
+	// pallet_babe::SameAuthoritiesForever.
+	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
 }
 
 /// Adds one to the given input and returns the final result.
@@ -615,7 +615,7 @@ cfg_if! {
 						c: (3, 10),
 						genesis_authorities: system::authorities()
 							.into_iter().map(|x|(x, 1)).collect(),
-						randomness: >::randomness(),
+						randomness: >::randomness(),
 						secondary_slots: true,
 					}
 				}
@@ -634,7 +634,7 @@ cfg_if! {
 				}
 			}
 
-			impl paint_system_rpc_runtime_api::AccountNonceApi for Runtime {
+			impl palette_system_rpc_runtime_api::AccountNonceApi for Runtime {
 				fn account_nonce(_account: AccountId) -> Index {
 					0
 				}
@@ -831,7 +831,7 @@ cfg_if! {
 						c: (3, 10),
 						genesis_authorities: system::authorities()
 							.into_iter().map(|x|(x, 1)).collect(),
-						randomness: >::randomness(),
+						randomness: >::randomness(),
 						secondary_slots: true,
 					}
 				}
@@ -850,7 +850,7 @@ cfg_if! {
 				}
 			}
 
-			impl paint_system_rpc_runtime_api::AccountNonceApi for Runtime {
+			impl palette_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 44743be200..d19641edcb 100644
--- a/substrate/test/utils/runtime/src/system.rs
+++ b/substrate/test/utils/runtime/src/system.rs
@@ -29,7 +29,7 @@ use sr_primitives::{
 	transaction_validity::{TransactionValidity, ValidTransaction, InvalidTransaction},
 };
 use codec::{KeyedVec, Encode};
-use paint_system::Trait;
+use palette_system::Trait;
 use crate::{
 	AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId
 };