diff --git a/Cargo.lock b/Cargo.lock
index b34d5f76c2253..e22c83fe32dd4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1714,6 +1714,7 @@ version = "2.0.0"
 dependencies = [
  "frame-metadata",
  "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "pretty_assertions",
  "rustversion",
diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs
index 729a71278aa9f..24de4f2f50dd5 100644
--- a/bin/node-template/pallets/template/src/lib.rs
+++ b/bin/node-template/pallets/template/src/lib.rs
@@ -14,9 +14,9 @@ mod mock;
 mod tests;
 
 /// Configure the pallet by specifying the parameters and types on which it depends.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Because this pallet emits events, it depends on the runtime's definition of an event.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 }
 
 // The pallet's runtime storage items.
@@ -25,7 +25,7 @@ decl_storage! {
 	// A unique name is used to ensure that the pallet's storage items are isolated.
 	// This name may be updated, but each pallet in the runtime must use a unique name.
 	// ---------------------------------vvvvvvvvvvvvvv
-	trait Store for Module<T: Trait> as TemplateModule {
+	trait Store for Module<T: Config> as TemplateModule {
 		// Learn more about declaring storage items:
 		// https://substrate.dev/docs/en/knowledgebase/runtime/storage#declaring-storage-items
 		Something get(fn something): Option<u32>;
@@ -35,7 +35,7 @@ decl_storage! {
 // Pallets use events to inform users when important changes are made.
 // https://substrate.dev/docs/en/knowledgebase/runtime/events
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// Event documentation should end with an array that provides descriptive names for event
 		/// parameters. [something, who]
 		SomethingStored(u32, AccountId),
@@ -44,7 +44,7 @@ decl_event!(
 
 // Errors inform users that something went wrong.
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Error names should be descriptive.
 		NoneValue,
 		/// Errors should have helpful documentation associated with them.
@@ -56,7 +56,7 @@ decl_error! {
 // These functions materialize as "extrinsics", which are often compared to transactions.
 // Dispatchable functions must be annotated with a weight and must return a DispatchResult.
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		// Errors must be initialized if they are used by the pallet.
 		type Error = Error<T>;
 
diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index a3dff240e4847..4c7c16e7f5578 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,4 +1,4 @@
-use crate::{Module, Trait};
+use crate::{Module, Config};
 use sp_core::H256;
 use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
 use sp_runtime::{
@@ -21,7 +21,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl system::Trait for Test {
+impl system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -49,7 +49,7 @@ impl system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 }
 
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index aadfd931cdb50..a899afe9ad12f 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -140,7 +140,7 @@ parameter_types! {
 
 // Configure FRAME pallets to include in runtime.
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = ();
 	/// The identifier used to distinguish between accounts.
@@ -199,11 +199,11 @@ impl frame_system::Trait for Runtime {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_aura::Trait for Runtime {
+impl pallet_aura::Config for Runtime {
 	type AuthorityId = AuraId;
 }
 
-impl pallet_grandpa::Trait for Runtime {
+impl pallet_grandpa::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 
@@ -226,7 +226,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = Aura;
@@ -239,7 +239,7 @@ parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
 	/// The type for recording an account's balance.
 	type Balance = Balance;
@@ -255,20 +255,20 @@ parameter_types! {
 	pub const TransactionByteFee: Balance = 1;
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ();
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 }
 
 /// Configure the pallet template in pallets/template.
-impl template::Trait for Runtime {
+impl template::Config for Runtime {
 	type Event = Event;
 }
 
@@ -457,7 +457,7 @@ impl_runtime_apis! {
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
 
 			use frame_system_benchmarking::Module as SystemBench;
-			impl frame_system_benchmarking::Trait for Runtime {}
+			impl frame_system_benchmarking::Config for Runtime {}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
diff --git a/bin/node/executor/tests/basic.rs b/bin/node/executor/tests/basic.rs
index 236e0a823ac33..09438bfacd455 100644
--- a/bin/node/executor/tests/basic.rs
+++ b/bin/node/executor/tests/basic.rs
@@ -580,7 +580,7 @@ const CODE_TRANSFER: &str = r#"
 #[test]
 fn deploying_wasm_contract_should_work() {
 	let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
-	let transfer_ch = <Runtime as frame_system::Trait>::Hashing::hash(&transfer_code);
+	let transfer_ch = <Runtime as frame_system::Config>::Hashing::hash(&transfer_code);
 
 	let addr = pallet_contracts::Module::<Runtime>::contract_address(
 		&charlie(),
@@ -588,7 +588,7 @@ fn deploying_wasm_contract_should_work() {
 		&[],
 	);
 
-	let subsistence = pallet_contracts::Config::<Runtime>::subsistence_threshold_uncached();
+	let subsistence = pallet_contracts::ConfigCache::<Runtime>::subsistence_threshold_uncached();
 
 	let b = construct_block(
 		&mut new_test_ext(compact_code_unwrap(), false),
diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
index 16666997b3a55..acd8def68353d 100644
--- a/bin/node/runtime/src/impls.rs
+++ b/bin/node/runtime/src/impls.rs
@@ -200,7 +200,7 @@ mod multiplier_tests {
 				fm = next;
 				iterations += 1;
 				let fee =
-					<Runtime as pallet_transaction_payment::Trait>::WeightToFee::calc(&tx_weight);
+					<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&tx_weight);
 				let adjusted_fee = fm.saturating_mul_acc_int(fee);
 				println!(
 					"iteration {}, new fm = {:?}. Fee at this point is: {} units / {} millicents, \
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 4feff5d051abe..be3783cd7ca5c 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -156,7 +156,7 @@ parameter_types! {
 
 const_assert!(AvailableBlockRatio::get().deconstruct() >= AVERAGE_ON_INITIALIZE_WEIGHT.deconstruct());
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -184,7 +184,7 @@ impl frame_system::Trait for Runtime {
 	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Runtime>;
 }
 
-impl pallet_utility::Trait for Runtime {
+impl pallet_utility::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type WeightInfo = pallet_utility::weights::SubstrateWeight<Runtime>;
@@ -198,7 +198,7 @@ parameter_types! {
 	pub const MaxSignatories: u16 = 100;
 }
 
-impl pallet_multisig::Trait for Runtime {
+impl pallet_multisig::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
@@ -261,7 +261,7 @@ impl InstanceFilter<Call> for ProxyType {
 	}
 }
 
-impl pallet_proxy::Trait for Runtime {
+impl pallet_proxy::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
@@ -281,7 +281,7 @@ parameter_types! {
 	pub const MaxScheduledPerBlock: u32 = 50;
 }
 
-impl pallet_scheduler::Trait for Runtime {
+impl pallet_scheduler::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type PalletsOrigin = OriginCaller;
@@ -297,7 +297,7 @@ parameter_types! {
 	pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
 }
 
-impl pallet_babe::Trait for Runtime {
+impl pallet_babe::Config for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	type EpochChangeTrigger = pallet_babe::ExternalTrigger;
@@ -324,7 +324,7 @@ parameter_types! {
 	pub const IndexDeposit: Balance = 1 * DOLLARS;
 }
 
-impl pallet_indices::Trait for Runtime {
+impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
 	type Currency = Balances;
 	type Deposit = IndexDeposit;
@@ -339,7 +339,7 @@ parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
 	type Balance = Balance;
 	type DustRemoval = ();
@@ -356,7 +356,7 @@ parameter_types! {
 	pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128);
 }
 
-impl pallet_transaction_payment::Trait for Runtime {
+impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = CurrencyAdapter<Balances, DealWithFees>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<Balance>;
@@ -368,7 +368,7 @@ parameter_types! {
 	pub const MinimumPeriod: Moment = SLOT_DURATION / 2;
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	type Moment = Moment;
 	type OnTimestampSet = Babe;
 	type MinimumPeriod = MinimumPeriod;
@@ -379,7 +379,7 @@ parameter_types! {
 	pub const UncleGenerations: BlockNumber = 5;
 }
 
-impl pallet_authorship::Trait for Runtime {
+impl pallet_authorship::Config for Runtime {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -399,9 +399,9 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17);
 }
 
-impl pallet_session::Trait for Runtime {
+impl pallet_session::Config for Runtime {
 	type Event = Event;
-	type ValidatorId = <Self as frame_system::Trait>::AccountId;
+	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = Babe;
 	type NextSessionRotation = Babe;
@@ -412,7 +412,7 @@ impl pallet_session::Trait for Runtime {
 	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
 }
 
-impl pallet_session::historical::Trait for Runtime {
+impl pallet_session::historical::Config for Runtime {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
 }
@@ -443,7 +443,7 @@ parameter_types! {
 		.saturating_sub(ExtrinsicBaseWeight::get());
 }
 
-impl pallet_staking::Trait for Runtime {
+impl pallet_staking::Config for Runtime {
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = U128CurrencyToVote;
@@ -489,7 +489,7 @@ parameter_types! {
 	pub const MaxProposals: u32 = 100;
 }
 
-impl pallet_democracy::Trait for Runtime {
+impl pallet_democracy::Config for Runtime {
 	type Proposal = Call;
 	type Event = Event;
 	type Currency = Balances;
@@ -541,7 +541,7 @@ parameter_types! {
 }
 
 type CouncilCollective = pallet_collective::Instance1;
-impl pallet_collective::Trait<CouncilCollective> for Runtime {
+impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type Origin = Origin;
 	type Proposal = Call;
 	type Event = Event;
@@ -564,7 +564,7 @@ parameter_types! {
 // Make sure that there are no more than `MaxMembers` members elected via elections-phragmen.
 const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get());
 
-impl pallet_elections_phragmen::Trait for Runtime {
+impl pallet_elections_phragmen::Config for Runtime {
 	type Event = Event;
 	type ModuleId = ElectionsPhragmenModuleId;
 	type Currency = Balances;
@@ -591,7 +591,7 @@ parameter_types! {
 }
 
 type TechnicalCollective = pallet_collective::Instance2;
-impl pallet_collective::Trait<TechnicalCollective> for Runtime {
+impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type Origin = Origin;
 	type Proposal = Call;
 	type Event = Event;
@@ -607,7 +607,7 @@ type EnsureRootOrHalfCouncil = EnsureOneOf<
 	EnsureRoot<AccountId>,
 	pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>
 >;
-impl pallet_membership::Trait<pallet_membership::Instance1> for Runtime {
+impl pallet_membership::Config<pallet_membership::Instance1> for Runtime {
 	type Event = Event;
 	type AddOrigin = EnsureRootOrHalfCouncil;
 	type RemoveOrigin = EnsureRootOrHalfCouncil;
@@ -636,7 +636,7 @@ parameter_types! {
 	pub const BountyValueMinimum: Balance = 5 * DOLLARS;
 }
 
-impl pallet_treasury::Trait for Runtime {
+impl pallet_treasury::Config for Runtime {
 	type ModuleId = TreasuryModuleId;
 	type Currency = Balances;
 	type ApproveOrigin = EnsureOneOf<
@@ -681,7 +681,7 @@ parameter_types! {
 	pub const MaxValueSize: u32 = 16 * 1024;
 }
 
-impl pallet_contracts::Trait for Runtime {
+impl pallet_contracts::Config for Runtime {
 	type Time = Timestamp;
 	type Randomness = RandomnessCollectiveFlip;
 	type Currency = Balances;
@@ -699,7 +699,7 @@ impl pallet_contracts::Trait for Runtime {
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 }
 
-impl pallet_sudo::Trait for Runtime {
+impl pallet_sudo::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 }
@@ -769,7 +769,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime where
 	type OverarchingCall = Call;
 }
 
-impl pallet_im_online::Trait for Runtime {
+impl pallet_im_online::Config for Runtime {
 	type AuthorityId = ImOnlineId;
 	type Event = Event;
 	type SessionDuration = SessionDuration;
@@ -782,16 +782,16 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Runtime {
+impl pallet_offences::Config for Runtime {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-impl pallet_authority_discovery::Trait for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {}
 
-impl pallet_grandpa::Trait for Runtime {
+impl pallet_grandpa::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 
@@ -820,7 +820,7 @@ parameter_types! {
 	pub const MaxRegistrars: u32 = 20;
 }
 
-impl pallet_identity::Trait for Runtime {
+impl pallet_identity::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
 	type BasicDeposit = BasicDeposit;
@@ -842,7 +842,7 @@ parameter_types! {
 	pub const RecoveryDeposit: Balance = 5 * DOLLARS;
 }
 
-impl pallet_recovery::Trait for Runtime {
+impl pallet_recovery::Config for Runtime {
 	type Event = Event;
 	type Call = Call;
 	type Currency = Balances;
@@ -863,7 +863,7 @@ parameter_types! {
 	pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie");
 }
 
-impl pallet_society::Trait for Runtime {
+impl pallet_society::Config for Runtime {
 	type Event = Event;
 	type ModuleId = SocietyModuleId;
 	type Currency = Balances;
@@ -884,7 +884,7 @@ parameter_types! {
 	pub const MinVestedTransfer: Balance = 100 * DOLLARS;
 }
 
-impl pallet_vesting::Trait for Runtime {
+impl pallet_vesting::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
 	type BlockNumberToBalance = ConvertInto;
@@ -1173,9 +1173,9 @@ impl_runtime_apis! {
 			use pallet_offences_benchmarking::Module as OffencesBench;
 			use frame_system_benchmarking::Module as SystemBench;
 
-			impl pallet_session_benchmarking::Trait for Runtime {}
-			impl pallet_offences_benchmarking::Trait for Runtime {}
-			impl frame_system_benchmarking::Trait for Runtime {}
+			impl pallet_session_benchmarking::Config for Runtime {}
+			impl pallet_offences_benchmarking::Config for Runtime {}
+			impl frame_system_benchmarking::Config for Runtime {}
 
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
diff --git a/bin/utils/subkey/src/lib.rs b/bin/utils/subkey/src/lib.rs
index 051628e84a193..c38a485765243 100644
--- a/bin/utils/subkey/src/lib.rs
+++ b/bin/utils/subkey/src/lib.rs
@@ -63,7 +63,7 @@ pub enum Subkey {
 /// Run the subkey command, given the apropriate runtime.
 pub fn run<R>() -> Result<(), Error>
 	where
-		R: frame_system::Trait,
+		R: frame_system::Config,
 		R::AccountId: Ss58Codec
 {
 	match Subkey::from_args() {
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index e5ad2ae352eb8..9ed442aada3a0 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -28,7 +28,7 @@
 //! * Asset Transfer
 //! * Asset Destruction
 //!
-//! To use it in your runtime, you need to implement the assets [`Trait`](./trait.Trait.html).
+//! To use it in your runtime, you need to implement the assets [`Config`](./trait.Config.html).
 //!
 //! The supported dispatchable functions are documented in the [`Call`](./enum.Call.html) enum.
 //!
@@ -89,10 +89,10 @@
 //! use frame_support::{decl_module, dispatch, ensure};
 //! use frame_system::ensure_signed;
 //!
-//! pub trait Trait: assets::Trait { }
+//! pub trait Config: assets::Config { }
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		pub fn issue_token_airdrop(origin) -> dispatch::DispatchResult {
 //! 			let sender = ensure_signed(origin).map_err(|e| e.as_str())?;
 //!
@@ -123,7 +123,7 @@
 //! them are violated, the behavior of this module is undefined.
 //!
 //! * The total count of assets should be less than
-//!   `Trait::AssetId::max_value()`.
+//!   `Config::AssetId::max_value()`.
 //!
 //! ## Related Modules
 //!
@@ -139,9 +139,9 @@ use frame_system::ensure_signed;
 use sp_runtime::traits::One;
 
 /// The module configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The units in which we record balances.
 	type Balance: Member + Parameter + AtLeast32BitUnsigned + Default + Copy;
@@ -151,7 +151,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -226,9 +226,9 @@ decl_module! {
 
 decl_event! {
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::Balance,
-		<T as Trait>::AssetId,
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::Balance,
+		<T as Config>::AssetId,
 	{
 		/// Some assets were issued. \[asset_id, owner, total_supply\]
 		Issued(AssetId, AccountId, Balance),
@@ -240,7 +240,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Transfer amount should be non-zero
 		AmountZero,
 		/// Account balance must be greater than or equal to the transfer amount
@@ -251,7 +251,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Assets {
+	trait Store for Module<T: Config> as Assets {
 		/// The number of units of assets held by any given account.
 		Balances: map hasher(blake2_128_concat) (T::AssetId, T::AccountId) => T::Balance;
 		/// The next asset identifier up for grabs.
@@ -264,7 +264,7 @@ decl_storage! {
 }
 
 // The main implementation block for the module.
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// Public immutables
 
 	/// Get the asset `id` balance of `who`.
@@ -298,7 +298,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -325,7 +325,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Balance = u64;
 		type AssetId = u32;
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 31f0c0f426525..ac9b82b0df067 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! A module for atomically sending funds.
 //!
-//! - [`atomic_swap::Trait`](./trait.Trait.html)
+//! - [`atomic_swap::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -56,7 +56,7 @@ use sp_runtime::RuntimeDebug;
 
 /// Pending atomic swap operation.
 #[derive(Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode)]
-pub struct PendingSwap<T: Trait> {
+pub struct PendingSwap<T: Config> {
 	/// Source of the swap.
 	pub source: T::AccountId,
 	/// Action of this swap.
@@ -74,7 +74,7 @@ pub type HashedProof = [u8; 32];
 /// succeeds with best efforts.
 /// - **Claim**: claim any resources reserved in the first phrase.
 /// - **Cancel**: cancel any resources reserved in the first phrase.
-pub trait SwapAction<AccountId, T: Trait> {
+pub trait SwapAction<AccountId, T: Config> {
 	/// Reserve the resources needed for the swap, from the given `source`. The reservation is
 	/// allowed to fail. If that is the case, the the full swap creation operation is cancelled.
 	fn reserve(&self, source: &AccountId) -> DispatchResult;
@@ -115,7 +115,7 @@ impl<AccountId, C> DerefMut for BalanceSwapAction<AccountId, C> where C: Reserva
 	}
 }
 
-impl<T: Trait, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<AccountId, C>
+impl<T: Config, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<AccountId, C>
 	where C: ReservableCurrency<AccountId>
 {
 	fn reserve(&self, source: &AccountId) -> DispatchResult {
@@ -136,9 +136,9 @@ impl<T: Trait, AccountId, C> SwapAction<AccountId, T> for BalanceSwapAction<Acco
 }
 
 /// Atomic swap's pallet configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	/// Swap action.
 	type SwapAction: SwapAction<Self::AccountId, Self> + Parameter;
 	/// Limit of proof size.
@@ -155,7 +155,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as AtomicSwap {
+	trait Store for Module<T: Config> as AtomicSwap {
 		pub PendingSwaps: double_map
 			hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) HashedProof
 			=> Option<PendingSwap<T>>;
@@ -163,7 +163,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Swap already exists.
 		AlreadyExist,
 		/// Swap proof is invalid.
@@ -186,7 +186,7 @@ decl_error! {
 decl_event!(
 	/// Event of atomic swap pallet.
 	pub enum Event<T> where
-		AccountId = <T as system::Trait>::AccountId,
+		AccountId = <T as system::Config>::AccountId,
 		PendingSwap = PendingSwap<T>,
 	{
 		/// Swap created. \[account, proof, swap\]
@@ -201,7 +201,7 @@ decl_event!(
 
 decl_module! {
 	/// Module definition of atomic swap pallet.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 060411c8815da..7254ceba4f63d 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -24,7 +24,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -54,7 +54,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -67,7 +67,7 @@ parameter_types! {
 	pub const ProofLimit: u32 = 1024;
 	pub const ExpireDuration: u64 = 100;
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type SwapAction = BalanceSwapAction<u64, Balances>;
 	type ProofLimit = ProofLimit;
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index e8e0e616bc0dc..34f216850c675 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Aura Module
 //!
-//! - [`aura::Trait`](./trait.Trait.html)
+//! - [`aura::Config`](./trait.Config.html)
 //! - [`Module`](./struct.Module.html)
 //!
 //! ## Overview
@@ -66,13 +66,13 @@ use sp_consensus_aura::{
 mod mock;
 mod tests;
 
-pub trait Trait: pallet_timestamp::Trait {
+pub trait Config: pallet_timestamp::Config {
 	/// The identifier type for an authority.
 	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Aura {
+	trait Store for Module<T: Config> as Aura {
 		/// The last timestamp.
 		LastTimestamp get(fn last): T::Moment;
 
@@ -86,10 +86,10 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin { }
+	pub struct Module<T: Config> for enum Call where origin: T::Origin { }
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn change_authorities(new: Vec<T::AuthorityId>) {
 		<Authorities<T>>::put(&new);
 
@@ -108,11 +108,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -145,7 +145,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> FindAuthor<u32> for Module<T> {
+impl<T: Config> FindAuthor<u32> for Module<T> {
 	fn find_author<'a, I>(digests: I) -> Option<u32> where
 		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
 	{
@@ -167,7 +167,7 @@ impl<T: Trait> FindAuthor<u32> for Module<T> {
 #[doc(hidden)]
 pub struct FindAccountFromAuthorIndex<T, Inner>(sp_std::marker::PhantomData<(T, Inner)>);
 
-impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
+impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
 	for FindAccountFromAuthorIndex<T, Inner>
 {
 	fn find_author<'a, I>(digests: I) -> Option<T::AuthorityId>
@@ -183,7 +183,7 @@ impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::AuthorityId>
 /// Find the authority ID of the Aura authority who authored the current block.
 pub type AuraAuthorId<T> = FindAccountFromAuthorIndex<T, Module<T>>;
 
-impl<T: Trait> IsMember<T::AuthorityId> for Module<T> {
+impl<T: Config> IsMember<T::AuthorityId> for Module<T> {
 	fn is_member(authority_id: &T::AuthorityId) -> bool {
 		Self::authorities()
 			.iter()
@@ -191,12 +191,12 @@ impl<T: Trait> IsMember<T::AuthorityId> for Module<T> {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Determine the Aura slot-duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of its slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
+		<T as pallet_timestamp::Config>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	fn on_timestamp_set(now: T::Moment, slot_duration: T::Moment) {
@@ -218,13 +218,13 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> OnTimestampSet<T::Moment> for Module<T> {
+impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
 	fn on_timestamp_set(moment: T::Moment) {
 		Self::on_timestamp_set(moment, Self::slot_duration())
 	}
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = pallet_timestamp::Call<T>;
 	type Error = MakeFatalError<sp_inherents::Error>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index a3875727e47c2..b06a0f427f1be 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use crate::{Trait, Module, GenesisConfig};
+use crate::{Config, Module, GenesisConfig};
 use sp_consensus_aura::ed25519::AuthorityId;
 use sp_runtime::{
 	traits::IdentityLookup, Perbill,
@@ -45,7 +45,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = 1;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -73,14 +73,14 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = Aura;
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type AuthorityId = AuthorityId;
 }
 
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 09be533474fca..4db7ba753cb60 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -28,10 +28,10 @@ use frame_support::{decl_module, decl_storage};
 use sp_authority_discovery::AuthorityId;
 
 /// The module's config trait.
-pub trait Trait: frame_system::Trait + pallet_session::Trait {}
+pub trait Config: frame_system::Config + pallet_session::Config {}
 
 decl_storage! {
-	trait Store for Module<T: Trait> as AuthorityDiscovery {
+	trait Store for Module<T: Config> as AuthorityDiscovery {
 		/// Keys of the current and next authority set.
 		Keys get(fn keys): Vec<AuthorityId>;
 	}
@@ -42,11 +42,11 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Retrieve authority identifiers of the current and next authority set.
 	pub fn authorities() -> Vec<AuthorityId> {
 		Keys::get()
@@ -60,11 +60,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(authorities: I)
@@ -107,13 +107,13 @@ mod tests {
 
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
-	impl Trait for Test {}
+	impl Config for Test {}
 
 	parameter_types! {
 		pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 	}
 
-	impl pallet_session::Trait for Test {
+	impl pallet_session::Config for Test {
 		type SessionManager = ();
 		type Keys = UintAuthorityId;
 		type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -126,7 +126,7 @@ mod tests {
 		type WeightInfo = ();
 	}
 
-	impl pallet_session::historical::Trait for Test {
+	impl pallet_session::historical::Config for Test {
 		type FullIdentification = ();
 		type FullIdentificationOf = ();
 	}
@@ -143,7 +143,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 0a10c8849571b..4809462db6e24 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -34,7 +34,7 @@ use sp_authorship::{INHERENT_IDENTIFIER, UnclesInherentData, InherentError};
 
 const MAX_UNCLES: usize = 10;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Find the author of a block.
 	type FindAuthor: FindAuthor<Self::AccountId>;
 	/// The number of blocks back we should accept uncles.
@@ -152,7 +152,7 @@ enum UncleEntryItem<BlockNumber, Hash, Author> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Authorship {
+	trait Store for Module<T: Config> as Authorship {
 		/// Uncles
 		Uncles: Vec<UncleEntryItem<T::BlockNumber, T::Hash, T::AccountId>>;
 		/// Author of current block.
@@ -164,7 +164,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the authorship module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The uncle parent not in the chain.
 		InvalidUncleParent,
 		/// Uncles already set in the block.
@@ -183,7 +183,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {
@@ -223,7 +223,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Fetch the author of the block.
 	///
 	/// This is safe to invoke in `on_initialize` implementations, as well
@@ -337,7 +337,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = Call<T>;
 	type Error = InherentError;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -417,7 +417,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -449,7 +449,7 @@ mod tests {
 		pub const UncleGenerations: u64 = 5;
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type FindAuthor = AuthorGiven;
 		type UncleGenerations = UncleGenerations;
 		type FilterUncle = SealVerify<VerifyBlock>;
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 322dff92f2398..55aaedfe082fe 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -48,14 +48,14 @@ use sp_staking::{
 };
 use sp_std::prelude::*;
 
-use crate::{Call, Module, Trait};
+use crate::{Call, Module, Config};
 
 /// A trait with utility methods for handling equivocation reports in BABE.
 /// The trait provides methods for reporting an offence triggered by a valid
 /// equivocation report, checking the current block author (to declare as the
 /// reporter), and also for creating and submitting equivocation report
 /// extrinsics (useful only in offchain context).
-pub trait HandleEquivocation<T: Trait> {
+pub trait HandleEquivocation<T: Config> {
 	/// Report an offence proved by the given reporters.
 	fn report_offence(
 		reporters: Vec<T::AccountId>,
@@ -75,7 +75,7 @@ pub trait HandleEquivocation<T: Trait> {
 	fn block_author() -> Option<T::AccountId>;
 }
 
-impl<T: Trait> HandleEquivocation<T> for () {
+impl<T: Config> HandleEquivocation<T> for () {
 	fn report_offence(
 		_reporters: Vec<T::AccountId>,
 		_offence: BabeEquivocationOffence<T::KeyOwnerIdentification>,
@@ -120,7 +120,7 @@ where
 	// We use the authorship pallet to fetch the current block author and use
 	// `offchain::SendTransactionTypes` for unsigned extrinsic creation and
 	// submission.
-	T: Trait + pallet_authorship::Trait + frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	// A system for reporting offences after valid equivocation reports are
 	// processed.
 	R: ReportOffence<
@@ -164,7 +164,7 @@ where
 /// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
 /// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
 /// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, _) = call {
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 8cab698fda093..a61f1244cbebd 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -62,7 +62,7 @@ mod tests;
 
 pub use equivocation::{BabeEquivocationOffence, EquivocationHandler, HandleEquivocation};
 
-pub trait Trait: pallet_timestamp::Trait {
+pub trait Config: pallet_timestamp::Config {
 	/// The amount of time, in slots, that each epoch should last.
 	type EpochDuration: Get<SlotNumber>;
 
@@ -115,7 +115,7 @@ pub trait WeightInfo {
 pub trait EpochChangeTrigger {
 	/// Trigger an epoch change, if any should take place. This should be called
 	/// during every block, after initialization is done.
-	fn trigger<T: Trait>(now: T::BlockNumber);
+	fn trigger<T: Config>(now: T::BlockNumber);
 }
 
 /// A type signifying to BABE that an external trigger
@@ -123,7 +123,7 @@ pub trait EpochChangeTrigger {
 pub struct ExternalTrigger;
 
 impl EpochChangeTrigger for ExternalTrigger {
-	fn trigger<T: Trait>(_: T::BlockNumber) { } // nothing - trigger is external.
+	fn trigger<T: Config>(_: T::BlockNumber) { } // nothing - trigger is external.
 }
 
 /// A type signifying to BABE that it should perform epoch changes
@@ -131,7 +131,7 @@ impl EpochChangeTrigger for ExternalTrigger {
 pub struct SameAuthoritiesForever;
 
 impl EpochChangeTrigger for SameAuthoritiesForever {
-	fn trigger<T: Trait>(now: T::BlockNumber) {
+	fn trigger<T: Config>(now: T::BlockNumber) {
 		if <Module<T>>::should_epoch_change(now) {
 			let authorities = <Module<T>>::authorities();
 			let next_authorities = authorities.clone();
@@ -146,7 +146,7 @@ const UNDER_CONSTRUCTION_SEGMENT_LENGTH: usize = 256;
 type MaybeRandomness = Option<schnorrkel::Randomness>;
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// An equivocation proof provided as part of an equivocation report is invalid.
 		InvalidEquivocationProof,
 		/// A key ownership proof provided as part of an equivocation report is invalid.
@@ -157,7 +157,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Babe {
+	trait Store for Module<T: Config> as Babe {
 		/// Current epoch index.
 		pub EpochIndex get(fn epoch_index): u64;
 
@@ -230,7 +230,7 @@ decl_storage! {
 
 decl_module! {
 	/// The BABE Pallet
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The number of **slots** that an epoch takes. We couple sessions to
 		/// epochs, i.e. we start a new session once the new epoch begins.
 		const EpochDuration: u64 = T::EpochDuration::get();
@@ -271,7 +271,7 @@ decl_module! {
 		/// the equivocation proof and validate the given key ownership proof
 		/// against the extracted offender. If both are valid, the offence will
 		/// be reported.
-		#[weight = <T as Trait>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
+		#[weight = <T as Config>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
 		fn report_equivocation(
 			origin,
 			equivocation_proof: EquivocationProof<T::Header>,
@@ -294,7 +294,7 @@ decl_module! {
 		/// block authors will call it (validated in `ValidateUnsigned`), as such
 		/// if the block author is defined it will be defined as the equivocation
 		/// reporter.
-		#[weight = <T as Trait>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
+		#[weight = <T as Config>::WeightInfo::report_equivocation(key_owner_proof.validator_count())]
 		fn report_equivocation_unsigned(
 			origin,
 			equivocation_proof: EquivocationProof<T::Header>,
@@ -311,7 +311,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> RandomnessT<<T as frame_system::Trait>::Hash> for Module<T> {
+impl<T: Config> RandomnessT<<T as frame_system::Config>::Hash> for Module<T> {
 	/// Some BABE blocks have VRF outputs where the block producer has exactly one bit of influence,
 	/// either they make the block or they do not make the block and thus someone else makes the
 	/// next block. Yet, this randomness is not fresh in all BABE blocks.
@@ -332,14 +332,14 @@ impl<T: Trait> RandomnessT<<T as frame_system::Trait>::Hash> for Module<T> {
 		subject.reserve(VRF_OUTPUT_LENGTH);
 		subject.extend_from_slice(&Self::randomness()[..]);
 
-		<T as frame_system::Trait>::Hashing::hash(&subject[..])
+		<T as frame_system::Config>::Hashing::hash(&subject[..])
 	}
 }
 
 /// A BABE public key
 pub type BabeKey = [u8; PUBLIC_KEY_LENGTH];
 
-impl<T: Trait> FindAuthor<u32> for Module<T> {
+impl<T: Config> FindAuthor<u32> for Module<T> {
 	fn find_author<'a, I>(digests: I) -> Option<u32> where
 		I: 'a + IntoIterator<Item=(ConsensusEngineId, &'a [u8])>
 	{
@@ -354,7 +354,7 @@ impl<T: Trait> FindAuthor<u32> for Module<T> {
 	}
 }
 
-impl<T: Trait> IsMember<AuthorityId> for Module<T> {
+impl<T: Config> IsMember<AuthorityId> for Module<T> {
 	fn is_member(authority_id: &AuthorityId) -> bool {
 		<Module<T>>::authorities()
 			.iter()
@@ -362,7 +362,7 @@ impl<T: Trait> IsMember<AuthorityId> for Module<T> {
 	}
 }
 
-impl<T: Trait> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
+impl<T: Config> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
 	fn should_end_session(now: T::BlockNumber) -> bool {
 		// it might be (and it is in current implementation) that session module is calling
 		// should_end_session() from it's own on_initialize() handler
@@ -374,12 +374,12 @@ impl<T: Trait> pallet_session::ShouldEndSession<T::BlockNumber> for Module<T> {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Determine the BABE slot duration based on the Timestamp module configuration.
 	pub fn slot_duration() -> T::Moment {
 		// we double the minimum block-period so each author can always propose within
 		// the majority of their slot.
-		<T as pallet_timestamp::Trait>::MinimumPeriod::get().saturating_mul(2u32.into())
+		<T as pallet_timestamp::Config>::MinimumPeriod::get().saturating_mul(2u32.into())
 	}
 
 	/// Determine whether an epoch change should take place at this block.
@@ -690,11 +690,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> OnTimestampSet<T::Moment> for Module<T> {
+impl<T: Config> OnTimestampSet<T::Moment> for Module<T> {
 	fn on_timestamp_set(_moment: T::Moment) { }
 }
 
-impl<T: Trait> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
+impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Module<T> {
 	fn estimate_next_session_rotation(now: T::BlockNumber) -> Option<T::BlockNumber> {
 		Self::next_expected_epoch_change(now)
 	}
@@ -706,17 +706,17 @@ impl<T: Trait> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber
 	}
 }
 
-impl<T: Trait> frame_support::traits::Lateness<T::BlockNumber> for Module<T> {
+impl<T: Config> frame_support::traits::Lateness<T::BlockNumber> for Module<T> {
 	fn lateness(&self) -> T::BlockNumber {
 		Self::lateness()
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -766,7 +766,7 @@ fn compute_randomness(
 	sp_io::hashing::blake2_256(&s)
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = pallet_timestamp::Call<T>;
 	type Error = MakeFatalError<sp_inherents::Error>;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index 9f00a4ddfc3cd..f3d5bc092bca7 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -18,7 +18,7 @@
 //! Test utilities
 
 use codec::Encode;
-use super::{Trait, Module, CurrentSlot};
+use super::{Config, Module, CurrentSlot};
 use sp_runtime::{
 	Perbill, impl_opaque_keys,
 	curve::PiecewiseLinear,
@@ -65,7 +65,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(16);
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -107,9 +107,9 @@ impl_opaque_keys! {
 	}
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type Event = ();
-	type ValidatorId = <Self as frame_system::Trait>::AccountId;
+	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
 	type ShouldEndSession = Babe;
 	type NextSessionRotation = Babe;
@@ -120,7 +120,7 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
@@ -129,7 +129,7 @@ parameter_types! {
 	pub const UncleGenerations: u64 = 0;
 }
 
-impl pallet_authorship::Trait for Test {
+impl pallet_authorship::Config for Test {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -140,7 +140,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = 1;
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = Babe;
 	type MinimumPeriod = MinimumPeriod;
@@ -151,7 +151,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u128 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
@@ -183,7 +183,7 @@ parameter_types! {
 	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = ();
@@ -212,14 +212,14 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Test {
+impl pallet_offences::Config for Test {
 	type Event = ();
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	type EpochChangeTrigger = crate::ExternalTrigger;
diff --git a/frame/babe/src/tests.rs b/frame/babe/src/tests.rs
index 06bf84614ca6d..29b080493f46b 100644
--- a/frame/babe/src/tests.rs
+++ b/frame/babe/src/tests.rs
@@ -206,7 +206,7 @@ fn authority_index() {
 #[test]
 fn can_predict_next_epoch_change() {
 	new_test_ext(1).execute_with(|| {
-		assert_eq!(<Test as Trait>::EpochDuration::get(), 3);
+		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
 		// this sets the genesis slot to 6;
 		go_to_block(1, 6);
 		assert_eq!(Babe::genesis_slot(), 6);
@@ -227,7 +227,7 @@ fn can_predict_next_epoch_change() {
 #[test]
 fn can_enact_next_config() {
 	new_test_ext(1).execute_with(|| {
-		assert_eq!(<Test as Trait>::EpochDuration::get(), 3);
+		assert_eq!(<Test as Config>::EpochDuration::get(), 3);
 		// this sets the genesis slot to 6;
 		go_to_block(1, 6);
 		assert_eq!(Babe::genesis_slot(), 6);
@@ -661,7 +661,7 @@ fn report_equivocation_has_valid_weight() {
 	// but there's a lower bound of 100 validators.
 	assert!(
 		(1..=100)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] == w[1])
@@ -671,7 +671,7 @@ fn report_equivocation_has_valid_weight() {
 	// with every extra validator.
 	assert!(
 		(100..=1000)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] < w[1])
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 141a360f7e180..1f119dad76f33 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! The Balances module provides functionality for handling accounts and balances.
 //!
-//! - [`balances::Trait`](./trait.Trait.html)
+//! - [`balances::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -99,12 +99,12 @@
 //!
 //! ```
 //! use frame_support::traits::Currency;
-//! # pub trait Trait: frame_system::Trait {
+//! # pub trait Config: frame_system::Config {
 //! # 	type Currency: Currency<Self::AccountId>;
 //! # }
 //!
-//! pub type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-//! pub type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+//! pub type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+//! pub type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 //!
 //! # fn main() {}
 //! ```
@@ -114,17 +114,17 @@
 //! ```
 //! use frame_support::traits::{WithdrawReasons, LockableCurrency};
 //! use sp_runtime::traits::Bounded;
-//! pub trait Trait: frame_system::Trait {
+//! pub trait Config: frame_system::Config {
 //! 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
 //! }
-//! # struct StakingLedger<T: Trait> {
-//! # 	stash: <T as frame_system::Trait>::AccountId,
-//! # 	total: <<T as Trait>::Currency as frame_support::traits::Currency<<T as frame_system::Trait>::AccountId>>::Balance,
+//! # struct StakingLedger<T: Config> {
+//! # 	stash: <T as frame_system::Config>::AccountId,
+//! # 	total: <<T as Config>::Currency as frame_support::traits::Currency<<T as frame_system::Config>::AccountId>>::Balance,
 //! # 	phantom: std::marker::PhantomData<T>,
 //! # }
 //! # const STAKING_ID: [u8; 8] = *b"staking ";
 //!
-//! fn update_ledger<T: Trait>(
+//! fn update_ledger<T: Config>(
 //! 	controller: &T::AccountId,
 //! 	ledger: &StakingLedger<T>
 //! ) {
@@ -145,7 +145,7 @@
 //!
 //! ## Assumptions
 //!
-//! * Total issued balanced of all accounts should be less than `Trait::Balance::max_value()`.
+//! * Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -179,7 +179,7 @@ use frame_system::{self as system, ensure_signed, ensure_root};
 pub use self::imbalances::{PositiveImbalance, NegativeImbalance};
 pub use weights::WeightInfo;
 
-pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Trait {
+pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Config {
 	/// The balance of an account.
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
 		MaybeSerializeDeserialize + Debug;
@@ -198,7 +198,7 @@ pub trait Subtrait<I: Instance = DefaultInstance>: frame_system::Trait {
 	type MaxLocks: Get<u32>;
 }
 
-pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
+pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
 	/// The balance of an account.
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Codec + Default + Copy +
 		MaybeSerializeDeserialize + Debug;
@@ -207,7 +207,7 @@ pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
 	type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The minimum amount required to keep an account open.
 	type ExistentialDeposit: Get<Self::Balance>;
@@ -223,18 +223,18 @@ pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
 	type MaxLocks: Get<u32>;
 }
 
-impl<T: Trait<I>, I: Instance> Subtrait<I> for T {
+impl<T: Config<I>, I: Instance> Subtrait<I> for T {
 	type Balance = T::Balance;
 	type ExistentialDeposit = T::ExistentialDeposit;
 	type AccountStore = T::AccountStore;
-	type WeightInfo = <T as Trait<I>>::WeightInfo;
+	type WeightInfo = <T as Config<I>>::WeightInfo;
 	type MaxLocks = T::MaxLocks;
 }
 
 decl_event!(
 	pub enum Event<T, I: Instance = DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait<I>>::Balance
+		<T as frame_system::Config>::AccountId,
+		<T as Config<I>>::Balance
 	{
 		/// An account was created with some free balance. \[account, free_balance\]
 		Endowed(AccountId, Balance),
@@ -259,7 +259,7 @@ decl_event!(
 );
 
 decl_error! {
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Vesting balance too high to send value
 		VestingBalance,
 		/// Account liquidity restrictions prevent withdrawal
@@ -382,7 +382,7 @@ impl Default for Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Balances {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Balances {
 		/// The total units issued in the system.
 		pub TotalIssuance get(fn total_issuance) build(|config: &GenesisConfig<T, I>| {
 			config.balances.iter().fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n)
@@ -408,7 +408,7 @@ decl_storage! {
 		build(|config: &GenesisConfig<T, I>| {
 			for (_, balance) in &config.balances {
 				assert!(
-					*balance >= <T as Trait<I>>::ExistentialDeposit::get(),
+					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
 					"the balance of any account should always be more than existential deposit.",
 				)
 			}
@@ -420,7 +420,7 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
 		type Error = Error<T, I>;
 
 		/// The minimum amount required to keep an account open.
@@ -565,7 +565,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	// PRIVATE MUTABLES
 
 	/// Get the free balance of an account.
@@ -704,7 +704,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 // of the inner member.
 mod imbalances {
 	use super::{
-		result, DefaultInstance, Imbalance, Trait, Zero, Instance, Saturating,
+		result, DefaultInstance, Imbalance, Config, Zero, Instance, Saturating,
 		StorageValue, TryDrop,
 	};
 	use sp_std::mem;
@@ -712,9 +712,9 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been created without any equal and opposite accounting.
 	#[must_use]
-	pub struct PositiveImbalance<T: Trait<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct PositiveImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
 
-	impl<T: Trait<I>, I: Instance> PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> PositiveImbalance<T, I> {
 		/// Create a new positive imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			PositiveImbalance(amount)
@@ -724,22 +724,22 @@ mod imbalances {
 	/// Opaque, move-only struct with private fields that serves as a token denoting that
 	/// funds have been destroyed without any equal and opposite accounting.
 	#[must_use]
-	pub struct NegativeImbalance<T: Trait<I>, I: Instance=DefaultInstance>(T::Balance);
+	pub struct NegativeImbalance<T: Config<I>, I: Instance=DefaultInstance>(T::Balance);
 
-	impl<T: Trait<I>, I: Instance> NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> NegativeImbalance<T, I> {
 		/// Create a new negative imbalance from a balance.
 		pub fn new(amount: T::Balance) -> Self {
 			NegativeImbalance(amount)
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> TryDrop for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> TryDrop for PositiveImbalance<T, I> {
 		fn try_drop(self) -> result::Result<(), Self> {
 			self.drop_zero()
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Imbalance<T::Balance> for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Imbalance<T::Balance> for PositiveImbalance<T, I> {
 		type Opposite = NegativeImbalance<T, I>;
 
 		fn zero() -> Self {
@@ -784,13 +784,13 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> TryDrop for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> TryDrop for NegativeImbalance<T, I> {
 		fn try_drop(self) -> result::Result<(), Self> {
 			self.drop_zero()
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Imbalance<T::Balance> for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Imbalance<T::Balance> for NegativeImbalance<T, I> {
 		type Opposite = PositiveImbalance<T, I>;
 
 		fn zero() -> Self {
@@ -835,7 +835,7 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Drop for PositiveImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Drop for PositiveImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
 			<super::TotalIssuance<T, I>>::mutate(
@@ -844,7 +844,7 @@ mod imbalances {
 		}
 	}
 
-	impl<T: Trait<I>, I: Instance> Drop for NegativeImbalance<T, I> {
+	impl<T: Config<I>, I: Instance> Drop for NegativeImbalance<T, I> {
 		/// Basic drop handler will just square up the total issuance.
 		fn drop(&mut self) {
 			<super::TotalIssuance<T, I>>::mutate(
@@ -854,7 +854,7 @@ mod imbalances {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
+impl<T: Config<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	type Balance = T::Balance;
@@ -1103,7 +1103,7 @@ impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I> where
 	}
 }
 
-impl<T: Trait<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>  where
+impl<T: Config<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>  where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	/// Check if `who` can reserve `value` from their free balance.
@@ -1218,7 +1218,7 @@ impl<T: Trait<I>, I: Instance> ReservableCurrency<T::AccountId> for Module<T, I>
 /// NOTE: You probably won't need to use this! This only needs to be "wired in" to System module
 /// if you're using the local balance storage. **If you're using the composite system account
 /// storage (which is the default in most examples and tests) then there's no need.**
-impl<T: Trait<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
 	fn on_killed_account(who: &T::AccountId) {
 		Account::<T, I>::mutate_exists(who, |account| {
 			let total = account.as_ref().map(|acc| acc.total()).unwrap_or_default();
@@ -1231,7 +1231,7 @@ impl<T: Trait<I>, I: Instance> OnKilledAccount<T::AccountId> for Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> LockableCurrency<T::AccountId> for Module<T, I>
+impl<T: Config<I>, I: Instance> LockableCurrency<T::AccountId> for Module<T, I>
 where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
@@ -1296,7 +1296,7 @@ where
 	}
 }
 
-impl<T: Trait<I>, I: Instance> IsDeadAccount<T::AccountId> for Module<T, I> where
+impl<T: Config<I>, I: Instance> IsDeadAccount<T::AccountId> for Module<T, I> where
 	T::Balance: MaybeSerializeDeserialize + Debug
 {
 	fn is_dead_account(who: &T::AccountId) -> bool {
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
index b8cf90dad9222..beaf2e2c223b2 100644
--- a/frame/balances/src/tests.rs
+++ b/frame/balances/src/tests.rs
@@ -23,7 +23,7 @@
 pub struct CallWithDispatchInfo;
 impl sp_runtime::traits::Dispatchable for CallWithDispatchInfo {
 	type Origin = ();
-	type Trait = ();
+	type Config = ();
 	type Info = frame_support::weights::DispatchInfo;
 	type PostInfo = frame_support::weights::PostDispatchInfo;
 
@@ -55,7 +55,7 @@ macro_rules! decl_tests {
 		pub type System = frame_system::Module<$test>;
 		pub type Balances = Module<$test>;
 
-		pub const CALL: &<$test as frame_system::Trait>::Call = &$crate::tests::CallWithDispatchInfo;
+		pub const CALL: &<$test as frame_system::Config>::Call = &$crate::tests::CallWithDispatchInfo;
 
 		/// create a transaction info struct from weight. Handy to avoid building the whole struct.
 		pub fn info_from_weight(w: Weight) -> DispatchInfo {
@@ -91,7 +91,7 @@ macro_rules! decl_tests {
 			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
 				assert_eq!(Balances::free_balance(1), 10);
 				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
-				assert!(!<<Test as Trait>::AccountStore as StoredMap<u64, AccountData<u64>>>::is_explicit(&1));
+				assert!(!<<Test as Config>::AccountStore as StoredMap<u64, AccountData<u64>>>::is_explicit(&1));
 			});
 		}
 
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
index fd4ba1fd3c305..5f0cea7c9635d 100644
--- a/frame/balances/src/tests_composite.rs
+++ b/frame/balances/src/tests_composite.rs
@@ -29,7 +29,7 @@ use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
 use pallet_transaction_payment::CurrencyAdapter;
-use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
+use crate::{GenesisConfig, Module, Config, decl_tests, tests::CallWithDispatchInfo};
 
 use frame_system as system;
 impl_outer_origin!{
@@ -57,7 +57,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub static ExistentialDeposit: u64 = 0;
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -87,14 +87,14 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
-impl pallet_transaction_payment::Trait for Test {
+impl pallet_transaction_payment::Config for Test {
 	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
 	type FeeMultiplierUpdate = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
index c0a5d23ff1a41..888b8c7d62b88 100644
--- a/frame/balances/src/tests_local.rs
+++ b/frame/balances/src/tests_local.rs
@@ -29,7 +29,7 @@ use sp_io;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
 use frame_support::traits::StorageMapShim;
 use frame_support::weights::{Weight, DispatchInfo, IdentityFee};
-use crate::{GenesisConfig, Module, Trait, decl_tests, tests::CallWithDispatchInfo};
+use crate::{GenesisConfig, Module, Config, decl_tests, tests::CallWithDispatchInfo};
 use pallet_transaction_payment::CurrencyAdapter;
 
 use frame_system as system;
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub static ExistentialDeposit: u64 = 0;
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -88,7 +88,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 }
-impl pallet_transaction_payment::Trait for Test {
+impl pallet_transaction_payment::Config for Test {
 	type OnChargeTransaction = CurrencyAdapter<Module<Test>, ()>;
 	type TransactionByteFee = TransactionByteFee;
 	type WeightToFee = IdentityFee<u64>;
@@ -97,7 +97,7 @@ impl pallet_transaction_payment::Trait for Test {
 parameter_types! {
 	pub const MaxLocks: u32 = 50;
 }
-impl Trait for Test {
+impl Config for Test {
 	type Balance = u64;
 	type DustRemoval = ();
 	type Event = Event;
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 45e4195f962d1..189947003b133 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -53,7 +53,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
 		(94_088_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
index 284b0545d03a5..fdfe857e4be3b 100644
--- a/frame/benchmarking/src/lib.rs
+++ b/frame/benchmarking/src/lib.rs
@@ -137,7 +137,7 @@ pub use sp_storage::TrackedStorageKey;
 ///
 /// Test functions are automatically generated for each benchmark and are accessible to you when you
 /// run `cargo test`. All tests are named `test_benchmark_<benchmark_name>`, expect you to pass them
-/// the Runtime Trait, and run them in a test externalities environment. The test function runs your
+/// the Runtime Config, and run them in a test externalities environment. The test function runs your
 /// benchmark just like a regular benchmark, but only testing at the lowest and highest values for
 /// each component. The function will return `Ok(())` if the benchmarks return no errors.
 ///
@@ -636,7 +636,7 @@ macro_rules! benchmark_backend {
 		#[allow(non_camel_case_types)]
 		struct $name;
 		#[allow(unused_variables)]
-		impl<T: Trait $( <$instance>, I: Instance)? >
+		impl<T: Config $( <$instance>, I: Instance)? >
 			$crate::BenchmarkingSetup<T $(, $instance)? > for $name
 			where $( $where_clause )*
 		{
@@ -710,7 +710,7 @@ macro_rules! selected_benchmark {
 		}
 
 		// Allow us to select a benchmark from the list of available benchmarks.
-		impl<T: Trait $( <$instance>, I: Instance )? >
+		impl<T: Config $( <$instance>, I: Instance )? >
 			$crate::BenchmarkingSetup<T $(, $instance )? > for SelectedBenchmark
 			where $( $where_clause )*
 		{
@@ -750,9 +750,9 @@ macro_rules! impl_benchmark {
 		( $( { $( $name_inst:ident )? } $name:ident )* )
 		( $( $name_extra:ident ),* )
 	) => {
-		impl<T: Trait $(<$instance>, I: Instance)? >
+		impl<T: Config $(<$instance>, I: Instance)? >
 			$crate::Benchmarking<$crate::BenchmarkResults> for Module<T $(, $instance)? >
-			where T: frame_system::Trait, $( $where_clause )*
+			where T: frame_system::Config, $( $where_clause )*
 		{
 			fn benchmarks(extra: bool) -> Vec<&'static [u8]> {
 				let mut all = vec![ $( stringify!($name).as_ref() ),* ];
@@ -948,8 +948,8 @@ macro_rules! impl_benchmark_test {
 		$name:ident
 	) => {
 		$crate::paste::item! {
-			fn [<test_benchmark_ $name>] <T: Trait > () -> Result<(), &'static str>
-				where T: frame_system::Trait, $( $where_clause )*
+			fn [<test_benchmark_ $name>] <T: Config > () -> Result<(), &'static str>
+				where T: frame_system::Config, $( $where_clause )*
 			{
 				let selected_benchmark = SelectedBenchmark::$name;
 				let components = <
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index 0429d98e18618..05a61ee83fbb6 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -29,16 +29,16 @@ use frame_support::{
 use frame_system::{RawOrigin, ensure_signed, ensure_none};
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Test where
-		<T as OtherTrait>::OtherEvent: Into<<T as Trait>::Event>
+	trait Store for Module<T: Config> as Test where
+		<T as OtherTrait>::OtherEvent: Into<<T as Config>::Event>
 	{
 		Value get(fn value): Option<u32>;
 	}
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where
-		origin: T::Origin, <T as OtherTrait>::OtherEvent: Into<<T as Trait>::Event>
+	pub struct Module<T: Config> for enum Call where
+		origin: T::Origin, <T as OtherTrait>::OtherEvent: Into<<T as Config>::Event>
 	{
 		#[weight = 0]
 		fn set_value(origin, n: u32) -> DispatchResult {
@@ -63,8 +63,8 @@ pub trait OtherTrait {
 	type OtherEvent;
 }
 
-pub trait Trait: frame_system::Trait + OtherTrait
-	where Self::OtherEvent: Into<<Self as Trait>::Event>
+pub trait Config: frame_system::Config + OtherTrait
+	where Self::OtherEvent: Into<<Self as Config>::Event>
 {
 	type Event;
 }
@@ -72,7 +72,7 @@ pub trait Trait: frame_system::Trait + OtherTrait
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -100,7 +100,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 }
 
@@ -113,7 +113,7 @@ fn new_test_ext() -> sp_io::TestExternalities {
 }
 
 benchmarks!{
-	where_clause { where <T as OtherTrait>::OtherEvent: Into<<T as Trait>::Event> }
+	where_clause { where <T as OtherTrait>::OtherEvent: Into<<T as Config>::Event> }
 
 	_ {
 		// Define a common range for `b`.
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index d4e80d515941f..551d6c7856cda 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -33,9 +33,9 @@ const SEED: u32 = 0;
 
 const MAX_BYTES: u32 = 1_024;
 
-fn assert_last_event<T: Trait<I>, I: Instance>(generic_event: <T as Trait<I>>::Event) {
+fn assert_last_event<T: Config<I>, I: Instance>(generic_event: <T as Config<I>>::Event) {
 	let events = System::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index b7d561672b82f..11ec42f25ae53 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -121,18 +121,18 @@ impl DefaultVote for MoreThanMajorityThenPrimeDefaultVote {
 	}
 }
 
-pub trait Trait<I: Instance=DefaultInstance>: frame_system::Trait {
+pub trait Config<I: Instance=DefaultInstance>: frame_system::Config {
 	/// The outer origin type.
 	type Origin: From<RawOrigin<Self::AccountId, I>>;
 
 	/// The outer call dispatch type.
 	type Proposal: Parameter
-		+ Dispatchable<Origin=<Self as Trait<I>>::Origin, PostInfo=PostDispatchInfo>
+		+ Dispatchable<Origin=<Self as Config<I>>::Origin, PostInfo=PostDispatchInfo>
 		+ From<frame_system::Call<Self>>
 		+ GetDispatchInfo;
 
 	/// The outer event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The time-out for council motions.
 	type MotionDuration: Get<Self::BlockNumber>;
@@ -166,7 +166,7 @@ pub enum RawOrigin<AccountId, I> {
 }
 
 /// Origin for the collective module.
-pub type Origin<T, I=DefaultInstance> = RawOrigin<<T as frame_system::Trait>::AccountId, I>;
+pub type Origin<T, I=DefaultInstance> = RawOrigin<<T as frame_system::Config>::AccountId, I>;
 
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
 /// Info for keeping track of a motion being voted on.
@@ -184,12 +184,12 @@ pub struct Votes<AccountId, BlockNumber> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Collective {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Collective {
 		/// The hashes of the active proposals.
 		pub Proposals get(fn proposals): Vec<T::Hash>;
 		/// Actual proposal for a given hash, if it's current.
 		pub ProposalOf get(fn proposal_of):
-			map hasher(identity) T::Hash => Option<<T as Trait<I>>::Proposal>;
+			map hasher(identity) T::Hash => Option<<T as Config<I>>::Proposal>;
 		/// Votes on a given proposal, if it is ongoing.
 		pub Voting get(fn voting):
 			map hasher(identity) T::Hash => Option<Votes<T::AccountId, T::BlockNumber>>;
@@ -209,8 +209,8 @@ decl_storage! {
 
 decl_event! {
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::Hash,
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::Hash,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// A motion (given hash) has been proposed (by given account) with a threshold (given
 		/// `MemberCount`).
@@ -239,7 +239,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Account is not a member
 		NotMember,
 		/// Duplicate proposals not allowed
@@ -276,7 +276,7 @@ fn get_result_weight(result: DispatchResultWithPostInfo) -> Option<Weight> {
 
 // Note that councillor operations are assigned to the operational class.
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where origin: <T as frame_system::Trait>::Origin {
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where origin: <T as frame_system::Config>::Origin {
 		type Error = Error<T, I>;
 
 		fn deposit_event() = default;
@@ -365,7 +365,7 @@ decl_module! {
 			DispatchClass::Operational
 		)]
 		fn execute(origin,
-			proposal: Box<<T as Trait<I>>::Proposal>,
+			proposal: Box<<T as Config<I>>::Proposal>,
 			#[compact] length_bound: u32,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -432,7 +432,7 @@ decl_module! {
 		)]
 		fn propose(origin,
 			#[compact] threshold: MemberCount,
-			proposal: Box<<T as Trait<I>>::Proposal>,
+			proposal: Box<<T as Config<I>>::Proposal>,
 			#[compact] length_bound: u32
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
@@ -682,7 +682,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// Check whether `who` is a member of the collective.
 	pub fn is_member(who: &T::AccountId) -> bool {
 		// Note: The dispatchables *do not* use this to check membership so make sure
@@ -698,7 +698,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 		hash: &T::Hash,
 		length_bound: u32,
 		weight_bound: Weight
-	) -> Result<(<T as Trait<I>>::Proposal, usize), DispatchError> {
+	) -> Result<(<T as Config<I>>::Proposal, usize), DispatchError> {
 		let key = ProposalOf::<T, I>::hashed_key_for(hash);
 		// read the length of the proposal storage entry directly
 		let proposal_len = storage::read(&key, &mut [0; 0], 0)
@@ -728,7 +728,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 		seats: MemberCount,
 		voting: Votes<T::AccountId, T::BlockNumber>,
 		proposal_hash: T::Hash,
-		proposal: <T as Trait<I>>::Proposal,
+		proposal: <T as Config<I>>::Proposal,
 	) -> (Weight, u32) {
 		Self::deposit_event(RawEvent::Approved(proposal_hash));
 
@@ -764,7 +764,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	/// Update the members of the collective. Votes are updated and the prime is reset.
 	///
 	/// NOTE: Does not enforce the expected `MaxMembers` limit on the amount of members, but
@@ -819,7 +819,7 @@ impl<T: Trait<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> InitializeMembers<T::AccountId> for Module<T, I> {
 	fn initialize_members(members: &[T::AccountId]) {
 		if !members.is_empty() {
 			assert!(<Members<T, I>>::get().is_empty(), "Members are already initialized!");
@@ -952,7 +952,7 @@ mod tests {
 		pub const MaxProposals: u32 = 100;
 		pub const MaxMembers: u32 = 100;
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -979,7 +979,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
-	impl Trait<Instance1> for Test {
+	impl Config<Instance1> for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
@@ -989,7 +989,7 @@ mod tests {
 		type DefaultVote = PrimeDefaultVote;
 		type WeightInfo = ();
 	}
-	impl Trait<Instance2> for Test {
+	impl Config<Instance2> for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
@@ -999,7 +999,7 @@ mod tests {
 		type DefaultVote = MoreThanMajorityThenPrimeDefaultVote;
 		type WeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Origin = Origin;
 		type Proposal = Call;
 		type Event = Event;
diff --git a/frame/collective/src/weights.rs b/frame/collective/src/weights.rs
index 4e4ec5196d0a7..8a76ff516ca35 100644
--- a/frame/collective/src/weights.rs
+++ b/frame/collective/src/weights.rs
@@ -58,7 +58,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_collective using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
 			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index f879d2eed5548..847be9b434cba 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -24,7 +24,7 @@
 //! we define this simple definition of a contract that can be passed to `create_code` that
 //! compiles it down into a `WasmModule` that can be used as a contract's code.
 
-use crate::Trait;
+use crate::Config;
 use crate::Module as Contracts;
 
 use parity_wasm::elements::{Instruction, Instructions, FuncBody, ValueType, BlockType};
@@ -87,9 +87,9 @@ pub struct ImportedMemory {
 }
 
 impl ImportedMemory {
-	pub fn max<T: Trait>() -> Self
+	pub fn max<T: Config>() -> Self
 	where
-		T: Trait,
+		T: Config,
 		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	{
 		let pages = max_pages::<T>();
@@ -105,15 +105,15 @@ pub struct ImportedFunction {
 
 /// A wasm module ready to be put on chain with `put_code`.
 #[derive(Clone)]
-pub struct WasmModule<T:Trait> {
+pub struct WasmModule<T:Config> {
 	pub code: Vec<u8>,
 	pub hash: <T::Hashing as Hash>::Output,
 	memory: Option<ImportedMemory>,
 }
 
-impl<T: Trait> From<ModuleDefinition> for WasmModule<T>
+impl<T: Config> From<ModuleDefinition> for WasmModule<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	fn from(def: ModuleDefinition) -> Self {
@@ -225,9 +225,9 @@ where
 	}
 }
 
-impl<T: Trait> WasmModule<T>
+impl<T: Config> WasmModule<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Creates a wasm module with an empty `call` and `deploy` function and nothing else.
@@ -483,9 +483,9 @@ pub mod body {
 }
 
 /// The maximum amount of pages any contract is allowed to have according to the current `Schedule`.
-pub fn max_pages<T: Trait>() -> u32
+pub fn max_pages<T: Config>() -> u32
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	Contracts::<T>::current_schedule().limits.memory_pages
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 2e15542368a56..4bdd279eb8b2c 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -50,7 +50,7 @@ const API_BENCHMARK_BATCHES: u32 = 20;
 const INSTR_BENCHMARK_BATCHES: u32 = 1;
 
 /// An instantiated and deployed contract.
-struct Contract<T: Trait> {
+struct Contract<T: Config> {
 	caller: T::AccountId,
 	account_id: T::AccountId,
 	addr: <T::Lookup as StaticLookup>::Source,
@@ -72,14 +72,14 @@ impl Endow {
 	/// The maximum amount of balance a caller can transfer without being brought below
 	/// the existential deposit. This assumes that every caller is funded with the amount
 	/// returned by `caller_funding`.
-	fn max<T:Trait>() -> BalanceOf<T> {
+	fn max<T:Config>() -> BalanceOf<T> {
 		caller_funding::<T>().saturating_sub(T::Currency::minimum_balance())
 	}
 }
 
-impl<T: Trait> Contract<T>
+impl<T: Config> Contract<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Create new contract and use a default account id as instantiator.
@@ -115,7 +115,7 @@ where
 				// storage_size cannot be zero because otherwise a contract that is just above
 				// the subsistence threshold does not pay rent given a large enough subsistence
 				// threshold. But we need rent payments to occur in order to benchmark for worst cases.
-				let storage_size = Config::<T>::subsistence_threshold_uncached()
+				let storage_size = ConfigCache::<T>::subsistence_threshold_uncached()
 					.checked_div(&T::RentDepositOffset::get())
 					.unwrap_or_else(Zero::zero);
 
@@ -212,16 +212,16 @@ where
 /// A `Contract` that was evicted after accumulating some storage.
 ///
 /// This is used to benchmark contract resurrection.
-struct Tombstone<T: Trait> {
+struct Tombstone<T: Config> {
 	/// The contract that was evicted.
 	contract: Contract<T>,
 	/// The storage the contract held when it was avicted.
 	storage: Vec<(StorageKey, Vec<u8>)>,
 }
 
-impl<T: Trait> Tombstone<T>
+impl<T: Config> Tombstone<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Create and evict a new contract with the supplied storage item count and size each.
@@ -243,7 +243,7 @@ where
 }
 
 /// Generate `stor_num` storage items. Each has the size `stor_size`.
-fn create_storage<T: Trait>(
+fn create_storage<T: Config>(
 	stor_num: u32,
 	stor_size: u32
 ) -> Result<Vec<(StorageKey, Vec<u8>)>, &'static str> {
@@ -257,7 +257,7 @@ fn create_storage<T: Trait>(
 }
 
 /// The funding that each account that either calls or instantiates contracts is funded with.
-fn caller_funding<T: Trait>() -> BalanceOf<T> {
+fn caller_funding<T: Config>() -> BalanceOf<T> {
 	BalanceOf::<T>::max_value() / 2u32.into()
 }
 
@@ -299,7 +299,7 @@ benchmarks! {
 		let s in 0 .. code::max_pages::<T>() * 64;
 		let data = vec![42u8; (n * 1024) as usize];
 		let salt = vec![42u8; (s * 1024) as usize];
-		let endowment = Config::<T>::subsistence_threshold_uncached();
+		let endowment = ConfigCache::<T>::subsistence_threshold_uncached();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
 		let WasmModule { code, hash, .. } = WasmModule::<T>::dummy_with_mem();
@@ -374,7 +374,7 @@ benchmarks! {
 		// the caller should get the reward for being a good snitch
 		assert_eq!(
 			T::Currency::free_balance(&instance.caller),
-			caller_funding::<T>() - instance.endowment + <T as Trait>::SurchargeReward::get(),
+			caller_funding::<T>() - instance.endowment + <T as Config>::SurchargeReward::get(),
 		);
 	}
 
@@ -1127,7 +1127,7 @@ benchmarks! {
 			.collect::<Vec<_>>();
 		let account_len = accounts.get(0).map(|i| i.encode().len()).unwrap_or(0);
 		let account_bytes = accounts.iter().flat_map(|x| x.encode()).collect();
-		let value = Config::<T>::subsistence_threshold_uncached();
+		let value = ConfigCache::<T>::subsistence_threshold_uncached();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1334,7 +1334,7 @@ benchmarks! {
 		let hash_len = hashes.get(0).map(|x| x.encode().len()).unwrap_or(0);
 		let hashes_bytes = hashes.iter().flat_map(|x| x.encode()).collect::<Vec<_>>();
 		let hashes_len = hashes_bytes.len();
-		let value = Config::<T>::subsistence_threshold_uncached();
+		let value = ConfigCache::<T>::subsistence_threshold_uncached();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
@@ -1454,7 +1454,7 @@ benchmarks! {
 		let input_len = inputs.get(0).map(|x| x.len()).unwrap_or(0);
 		let input_bytes = inputs.iter().cloned().flatten().collect::<Vec<_>>();
 		let inputs_len = input_bytes.len();
-		let value = Config::<T>::subsistence_threshold_uncached();
+		let value = ConfigCache::<T>::subsistence_threshold_uncached();
 		assert!(value > 0u32.into());
 		let value_bytes = value.encode();
 		let value_len = value_bytes.len();
diff --git a/frame/contracts/src/benchmarking/sandbox.rs b/frame/contracts/src/benchmarking/sandbox.rs
index 76cebfaf1ed6f..61277ebce6780 100644
--- a/frame/contracts/src/benchmarking/sandbox.rs
+++ b/frame/contracts/src/benchmarking/sandbox.rs
@@ -20,7 +20,7 @@
 ///! environment that provides the seal interface as imported functions.
 
 use super::{
-	Trait,
+	Config,
 	code::WasmModule,
 };
 use sp_core::crypto::UncheckedFrom;
@@ -39,9 +39,9 @@ impl Sandbox {
 	}
 }
 
-impl<T: Trait> From<&WasmModule<T>> for Sandbox
+impl<T: Config> From<&WasmModule<T>> for Sandbox
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
 	/// Creates an instance from the supplied module and supplies as much memory
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 73e1f564498dd..8577d04452fa8 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -15,7 +15,7 @@
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-	CodeHash, Config, Event, RawEvent, Trait, Module as Contracts,
+	CodeHash, ConfigCache, Event, RawEvent, Config, Module as Contracts,
 	TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
 	Error, ContractInfoOf
 };
@@ -30,14 +30,14 @@ use frame_support::{
 };
 use pallet_contracts_primitives::{ErrorOrigin, ExecError, ExecReturnValue, ExecResult, ReturnFlags};
 
-pub type AccountIdOf<T> = <T as frame_system::Trait>::AccountId;
-pub type MomentOf<T> = <<T as Trait>::Time as Time>::Moment;
-pub type SeedOf<T> = <T as frame_system::Trait>::Hash;
-pub type BlockNumberOf<T> = <T as frame_system::Trait>::BlockNumber;
+pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
+pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
+pub type SeedOf<T> = <T as frame_system::Config>::Hash;
+pub type BlockNumberOf<T> = <T as frame_system::Config>::BlockNumber;
 pub type StorageKey = [u8; 32];
 
 /// A type that represents a topic of an event. At the moment a hash is used.
-pub type TopicOf<T> = <T as frame_system::Trait>::Hash;
+pub type TopicOf<T> = <T as frame_system::Config>::Hash;
 
 /// Describes whether we deal with a contract or a plain account.
 pub enum TransactorKind {
@@ -54,7 +54,7 @@ pub enum TransactorKind {
 /// This interface is specialized to an account of the executing code, so all
 /// operations are implicitly performed on that account.
 pub trait Ext {
-	type T: Trait;
+	type T: Config;
 
 	/// Returns the storage entry of the executing account by the given `key`.
 	///
@@ -171,7 +171,7 @@ pub trait Ext {
 
 /// Loader is a companion of the `Vm` trait. It loads an appropriate abstract
 /// executable to be executed by an accompanying `Vm` implementation.
-pub trait Loader<T: Trait> {
+pub trait Loader<T: Config> {
 	type Executable;
 
 	/// Load the initializer portion of the code specified by the `code_hash`. This
@@ -190,7 +190,7 @@ pub trait Loader<T: Trait> {
 ///
 /// Execution of code can end by either implicit termination (that is, reached the end of
 /// executable), explicit termination via returning a buffer or termination due to a trap.
-pub trait Vm<T: Trait> {
+pub trait Vm<T: Config> {
 	type Executable;
 
 	fn execute<E: Ext<T = T>>(
@@ -202,12 +202,12 @@ pub trait Vm<T: Trait> {
 	) -> ExecResult;
 }
 
-pub struct ExecutionContext<'a, T: Trait + 'a, V, L> {
+pub struct ExecutionContext<'a, T: Config + 'a, V, L> {
 	pub caller: Option<&'a ExecutionContext<'a, T, V, L>>,
 	pub self_account: T::AccountId,
 	pub self_trie_id: Option<TrieId>,
 	pub depth: usize,
-	pub config: &'a Config<T>,
+	pub config: &'a ConfigCache<T>,
 	pub vm: &'a V,
 	pub loader: &'a L,
 	pub timestamp: MomentOf<T>,
@@ -216,7 +216,7 @@ pub struct ExecutionContext<'a, T: Trait + 'a, V, L> {
 
 impl<'a, T, E, V, L> ExecutionContext<'a, T, V, L>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	L: Loader<T, Executable = E>,
 	V: Vm<T, Executable = E>,
@@ -225,7 +225,7 @@ where
 	///
 	/// The specified `origin` address will be used as `sender` for. The `origin` must be a regular
 	/// account (not a contract).
-	pub fn top_level(origin: T::AccountId, cfg: &'a Config<T>, vm: &'a V, loader: &'a L) -> Self {
+	pub fn top_level(origin: T::AccountId, cfg: &'a ConfigCache<T>, vm: &'a V, loader: &'a L) -> Self {
 		ExecutionContext {
 			caller: None,
 			self_trie_id: None,
@@ -437,7 +437,7 @@ enum TransferCause {
 /// is specified as `Terminate`. Otherwise, any transfer that would bring the sender below the
 /// subsistence threshold (for contracts) or the existential deposit (for plain accounts)
 /// results in an error.
-fn transfer<'a, T: Trait, V: Vm<T>, L: Loader<T>>(
+fn transfer<'a, T: Config, V: Vm<T>, L: Loader<T>>(
 	cause: TransferCause,
 	origin: TransactorKind,
 	transactor: &T::AccountId,
@@ -483,7 +483,7 @@ where
 /// implies that the control won't be returned to the contract anymore, but there is still some code
 /// on the path of the return from that call context. Therefore, care must be taken in these
 /// situations.
-struct CallContext<'a, 'b: 'a, T: Trait + 'b, V: Vm<T> + 'b, L: Loader<T>> {
+struct CallContext<'a, 'b: 'a, T: Config + 'b, V: Vm<T> + 'b, L: Loader<T>> {
 	ctx: &'a mut ExecutionContext<'b, T, V, L>,
 	caller: T::AccountId,
 	value_transferred: BalanceOf<T>,
@@ -493,7 +493,7 @@ struct CallContext<'a, 'b: 'a, T: Trait + 'b, V: Vm<T> + 'b, L: Loader<T>> {
 
 impl<'a, 'b: 'a, T, E, V, L> Ext for CallContext<'a, 'b, T, V, L>
 where
-	T: Trait + 'b,
+	T: Config + 'b,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 	V: Vm<T, Executable = E>,
 	L: Loader<T, Executable = E>,
@@ -693,13 +693,13 @@ where
 	}
 }
 
-fn deposit_event<T: Trait>(
+fn deposit_event<T: Config>(
 	topics: Vec<T::Hash>,
 	event: Event<T>,
 ) {
 	<frame_system::Module<T>>::deposit_event_indexed(
 		&*topics,
-		<T as Trait>::Event::from(event).into(),
+		<T as Config>::Event::from(event).into(),
 	)
 }
 
@@ -716,7 +716,7 @@ mod tests {
 	};
 	use crate::{
 		gas::GasMeter, tests::{ExtBuilder, Test, MetaEvent},
-		exec::ExecReturnValue, CodeHash, Config,
+		exec::ExecReturnValue, CodeHash, ConfigCache,
 		gas::Gas,
 		storage::Storage,
 		tests::{ALICE, BOB, CHARLIE},
@@ -769,7 +769,7 @@ mod tests {
 
 		fn insert(&mut self, f: impl Fn(MockCtx) -> ExecResult + 'a) -> CodeHash<Test> {
 			// Generate code hashes as monotonically increasing values.
-			let code_hash = <Test as frame_system::Trait>::Hash::from_low_u64_be(self.counter);
+			let code_hash = <Test as frame_system::Config>::Hash::from_low_u64_be(self.counter);
 
 			self.counter += 1;
 			self.map.insert(code_hash, MockExecutable::new(f));
@@ -843,7 +843,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			place_contract(&BOB, exec_ch);
 
@@ -867,7 +867,7 @@ mod tests {
 		let loader = MockLoader::empty();
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			set_balance(&origin, 100);
 			set_balance(&dest, 0);
@@ -900,7 +900,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 			set_balance(&origin, 100);
@@ -930,7 +930,7 @@ mod tests {
 		let loader = MockLoader::empty();
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			set_balance(&origin, 0);
 
@@ -966,7 +966,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 
@@ -997,7 +997,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
 			place_contract(&BOB, return_ch);
 
@@ -1025,7 +1025,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via call.
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			place_contract(&BOB, input_data_ch);
 
@@ -1050,7 +1050,7 @@ mod tests {
 
 		// This one tests passing the input data into a contract via instantiate.
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 
 			set_balance(&ALICE, 100);
@@ -1097,7 +1097,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&BOB, 1);
 			place_contract(&BOB, recurse_ch);
@@ -1142,7 +1142,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 
 			let mut ctx = ExecutionContext::top_level(origin.clone(), &cfg, &vm, &loader);
 			place_contract(&dest, bob_ch);
@@ -1184,7 +1184,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			place_contract(&BOB, bob_ch);
 			place_contract(&CHARLIE, charlie_ch);
@@ -1208,7 +1208,7 @@ mod tests {
 		let dummy_ch = loader.insert(|_| exec_success());
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 
 			assert_matches!(
@@ -1234,7 +1234,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 
@@ -1268,7 +1268,7 @@ mod tests {
 		);
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 
@@ -1303,7 +1303,7 @@ mod tests {
 				// Instantiate a contract and save it's address in `instantiated_contract_address`.
 				let (address, output) = ctx.ext.instantiate(
 					&dummy_ch,
-					Config::<Test>::subsistence_threshold_uncached(),
+					ConfigCache::<Test>::subsistence_threshold_uncached(),
 					ctx.gas_meter,
 					vec![],
 					&[48, 49, 50],
@@ -1315,7 +1315,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
@@ -1368,7 +1368,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().existential_deposit(15).build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 1000);
 			set_balance(&BOB, 100);
@@ -1400,7 +1400,7 @@ mod tests {
 			.existential_deposit(15)
 			.build()
 			.execute_with(|| {
-				let cfg = Config::preload();
+				let cfg = ConfigCache::preload();
 				let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 				set_balance(&ALICE, 1000);
 
@@ -1434,7 +1434,7 @@ mod tests {
 		});
 
 		ExtBuilder::default().build().execute_with(|| {
-			let cfg = Config::preload();
+			let cfg = ConfigCache::preload();
 			let mut ctx = ExecutionContext::top_level(ALICE, &cfg, &vm, &loader);
 			set_balance(&ALICE, 100);
 
diff --git a/frame/contracts/src/gas.rs b/frame/contracts/src/gas.rs
index 0828a220c0406..18a200fd312cd 100644
--- a/frame/contracts/src/gas.rs
+++ b/frame/contracts/src/gas.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate. If not, see <http://www.gnu.org/licenses/>.
 
-use crate::Trait;
+use crate::Config;
 use sp_std::marker::PhantomData;
 use sp_runtime::traits::Zero;
 use frame_support::dispatch::{
@@ -60,7 +60,7 @@ impl<T: Any + Debug + PartialEq + Eq> TestAuxiliaries for T {}
 /// Implementing type is expected to be super lightweight hence `Copy` (`Clone` is added
 /// for consistency). If inlined there should be no observable difference compared
 /// to a hand-written code.
-pub trait Token<T: Trait>: Copy + Clone + TestAuxiliaries {
+pub trait Token<T: Config>: Copy + Clone + TestAuxiliaries {
 	/// Metadata type, which the token can require for calculating the amount
 	/// of gas to charge. Can be a some configuration type or
 	/// just the `()`.
@@ -84,7 +84,7 @@ pub struct ErasedToken {
 	pub token: Box<dyn Any>,
 }
 
-pub struct GasMeter<T: Trait> {
+pub struct GasMeter<T: Config> {
 	gas_limit: Gas,
 	/// Amount of gas left from initial gas limit. Can reach zero.
 	gas_left: Gas,
@@ -92,7 +92,7 @@ pub struct GasMeter<T: Trait> {
 	#[cfg(test)]
 	tokens: Vec<ErasedToken>,
 }
-impl<T: Trait> GasMeter<T> {
+impl<T: Config> GasMeter<T> {
 	pub fn new(gas_limit: Gas) -> Self {
 		GasMeter {
 			gas_limit,
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 65995afb73d6a..f0200fbd15fd4 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -18,7 +18,7 @@
 //!
 //! The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 //!
-//! - [`contract::Trait`](./trait.Trait.html)
+//! - [`contract::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -126,18 +126,18 @@ use pallet_contracts_primitives::{
 };
 use frame_support::weights::Weight;
 
-pub type CodeHash<T> = <T as frame_system::Trait>::Hash;
+pub type CodeHash<T> = <T as frame_system::Config>::Hash;
 pub type TrieId = Vec<u8>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account
 #[derive(Encode, Decode, RuntimeDebug)]
-pub enum ContractInfo<T: Trait> {
+pub enum ContractInfo<T: Config> {
 	Alive(AliveContractInfo<T>),
 	Tombstone(TombstoneContractInfo<T>),
 }
 
-impl<T: Trait> ContractInfo<T> {
+impl<T: Config> ContractInfo<T> {
 	/// If contract is alive then return some alive info
 	pub fn get_alive(self) -> Option<AliveContractInfo<T>> {
 		if let ContractInfo::Alive(alive) = self {
@@ -190,7 +190,7 @@ impl<T: Trait> ContractInfo<T> {
 }
 
 pub type AliveContractInfo<T> =
-	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Trait>::BlockNumber>;
+	RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account.
@@ -230,7 +230,7 @@ pub(crate) fn child_trie_info(trie_id: &[u8]) -> ChildInfo {
 }
 
 pub type TombstoneContractInfo<T> =
-	RawTombstoneContractInfo<<T as frame_system::Trait>::Hash, <T as frame_system::Trait>::Hashing>;
+	RawTombstoneContractInfo<<T as frame_system::Config>::Hash, <T as frame_system::Config>::Hashing>;
 
 #[derive(Encode, Decode, PartialEq, Eq, RuntimeDebug)]
 pub struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
@@ -250,18 +250,18 @@ where
 	}
 }
 
-impl<T: Trait> From<AliveContractInfo<T>> for ContractInfo<T> {
+impl<T: Config> From<AliveContractInfo<T>> for ContractInfo<T> {
 	fn from(alive_info: AliveContractInfo<T>) -> Self {
 		Self::Alive(alive_info)
 	}
 }
 
 pub type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 pub type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	type Time: Time;
 	type Randomness: Randomness<Self::Hash>;
 
@@ -269,7 +269,7 @@ pub trait Trait: frame_system::Trait {
 	type Currency: Currency<Self::AccountId>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Handler for rent payments.
 	type RentPayment: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -323,7 +323,7 @@ pub trait Trait: frame_system::Trait {
 
 decl_error! {
 	/// Error for the contracts module.
-	pub enum Error for Module<T: Trait>
+	pub enum Error for Module<T: Config>
 	where
 		T::AccountId: UncheckedFrom<T::Hash>,
 		T::AccountId: AsRef<[u8]>,
@@ -383,7 +383,7 @@ decl_error! {
 
 decl_module! {
 	/// Contracts module.
-	pub struct Module<T: Trait> for enum Call
+	pub struct Module<T: Config> for enum Call
 	where
 		origin: T::Origin,
 		T::AccountId: UncheckedFrom<T::Hash>,
@@ -564,7 +564,7 @@ decl_module! {
 }
 
 /// Public APIs provided by the contracts module.
-impl<T: Trait> Module<T>
+impl<T: Config> Module<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
@@ -638,7 +638,7 @@ where
 	}
 }
 
-impl<T: Trait> Module<T>
+impl<T: Config> Module<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>,
 {
@@ -647,7 +647,7 @@ where
 		gas_meter: &mut GasMeter<T>,
 		func: impl FnOnce(&mut ExecutionContext<T, WasmVm<T>, WasmLoader<T>>, &mut GasMeter<T>) -> ExecResult,
 	) -> ExecResult {
-		let cfg = Config::preload();
+		let cfg = ConfigCache::preload();
 		let vm = WasmVm::new(&cfg.schedule);
 		let loader = WasmLoader::new(&cfg.schedule);
 		let mut ctx = ExecutionContext::top_level(origin, &cfg, &vm, &loader);
@@ -659,8 +659,8 @@ decl_event! {
 	pub enum Event<T>
 	where
 		Balance = BalanceOf<T>,
-		<T as frame_system::Trait>::AccountId,
-		<T as frame_system::Trait>::Hash
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash
 	{
 		/// Contract deployed by address at the specified address. \[owner, contract\]
 		Instantiated(AccountId, AccountId),
@@ -699,7 +699,7 @@ decl_event! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Contracts
+	trait Store for Module<T: Config> as Contracts
 	where
 		T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 	{
@@ -722,7 +722,7 @@ decl_storage! {
 ///
 /// We assume that these values can't be changed in the
 /// course of transaction execution.
-pub struct Config<T: Trait> {
+pub struct ConfigCache<T: Config> {
 	pub schedule: Schedule<T>,
 	pub existential_deposit: BalanceOf<T>,
 	pub tombstone_deposit: BalanceOf<T>,
@@ -730,12 +730,12 @@ pub struct Config<T: Trait> {
 	pub max_value_size: u32,
 }
 
-impl<T: Trait> Config<T>
+impl<T: Config> ConfigCache<T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
-	fn preload() -> Config<T> {
-		Config {
+	fn preload() -> ConfigCache<T> {
+		ConfigCache {
 			schedule: <Module<T>>::current_schedule(),
 			existential_deposit: T::Currency::minimum_balance(),
 			tombstone_deposit: T::TombstoneDeposit::get(),
diff --git a/frame/contracts/src/rent.rs b/frame/contracts/src/rent.rs
index a8886b990a95f..6ee65a54bb58c 100644
--- a/frame/contracts/src/rent.rs
+++ b/frame/contracts/src/rent.rs
@@ -18,7 +18,7 @@
 
 use crate::{
 	AliveContractInfo, BalanceOf, ContractInfo, ContractInfoOf, Module, RawEvent,
-	TombstoneContractInfo, Trait, CodeHash, Config, Error,
+	TombstoneContractInfo, Config, CodeHash, ConfigCache, Error,
 };
 use sp_std::prelude::*;
 use sp_io::hashing::blake2_256;
@@ -36,11 +36,11 @@ use sp_runtime::{
 ///
 /// This amount respects the contract's rent allowance and the subsistence deposit.
 /// Because of that, charging the amount cannot remove the contract.
-struct OutstandingAmount<T: Trait> {
+struct OutstandingAmount<T: Config> {
 	amount: BalanceOf<T>,
 }
 
-impl<T: Trait> OutstandingAmount<T> {
+impl<T: Config> OutstandingAmount<T> {
 	/// Create the new outstanding amount.
 	///
 	/// The amount should be always withdrawable and it should not kill the account.
@@ -67,7 +67,7 @@ impl<T: Trait> OutstandingAmount<T> {
 	}
 }
 
-enum Verdict<T: Trait> {
+enum Verdict<T: Config> {
 	/// The contract is exempted from paying rent.
 	///
 	/// For example, it already paid its rent in the current block, or it has enough deposit for not
@@ -90,7 +90,7 @@ pub struct Rent<T>(sp_std::marker::PhantomData<T>);
 
 impl<T> Rent<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	/// Returns a fee charged per block from the contract.
@@ -129,7 +129,7 @@ where
 		free_balance: &BalanceOf<T>,
 		contract: &AliveContractInfo<T>,
 	) -> Option<BalanceOf<T>> {
-		let subsistence_threshold = Config::<T>::subsistence_threshold_uncached();
+		let subsistence_threshold = ConfigCache::<T>::subsistence_threshold_uncached();
 		// Reserved balance contributes towards the subsistence threshold to stay consistent
 		// with the existential deposit where the reserved balance is also counted.
 		if *total_balance < subsistence_threshold {
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 197cc654c59b9..b80aceb361fe9 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -17,7 +17,7 @@
 //! This module contains the cost schedule and supporting code that constructs a
 //! sane default schedule from a `WeightInfo` implementation.
 
-use crate::{Trait, weights::WeightInfo};
+use crate::{Config, weights::WeightInfo};
 
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
@@ -42,7 +42,7 @@ pub const INSTR_BENCHMARK_BATCH_SIZE: u32 = 1_000;
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(bound(serialize = "", deserialize = "")))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, ScheduleDebug)]
-pub struct Schedule<T: Trait> {
+pub struct Schedule<T: Config> {
 	/// Version of the schedule.
 	pub version: u32,
 
@@ -131,7 +131,7 @@ pub struct Limits {
 ///    and dropping return values in order to maintain a valid module.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
-pub struct InstructionWeights<T: Trait> {
+pub struct InstructionWeights<T: Config> {
 	pub i64const: u32,
 	pub i64load: u32,
 	pub i64store: u32,
@@ -190,7 +190,7 @@ pub struct InstructionWeights<T: Trait> {
 /// Describes the weight for each imported function that a contract is allowed to call.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Clone, Encode, Decode, PartialEq, Eq, WeightDebug)]
-pub struct HostFnWeights<T: Trait> {
+pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_caller`.
 	pub caller: Weight,
 
@@ -410,7 +410,7 @@ macro_rules! cost_byte_batched {
 	}
 }
 
-impl<T: Trait> Default for Schedule<T> {
+impl<T: Config> Default for Schedule<T> {
 	fn default() -> Self {
 		Self {
 			version: 0,
@@ -440,7 +440,7 @@ impl Default for Limits {
 	}
 }
 
-impl<T: Trait> Default for InstructionWeights<T> {
+impl<T: Config> Default for InstructionWeights<T> {
 	fn default() -> Self {
 		let max_pages = Limits::default().memory_pages;
 		Self {
@@ -500,7 +500,7 @@ impl<T: Trait> Default for InstructionWeights<T> {
 	}
 }
 
-impl<T: Trait> Default for HostFnWeights<T> {
+impl<T: Config> Default for HostFnWeights<T> {
 	fn default() -> Self {
 		Self {
 			caller: cost_batched!(seal_caller),
@@ -554,12 +554,12 @@ impl<T: Trait> Default for HostFnWeights<T> {
 	}
 }
 
-struct ScheduleRules<'a, T: Trait> {
+struct ScheduleRules<'a, T: Config> {
 	schedule: &'a Schedule<T>,
 	params: Vec<u32>,
 }
 
-impl<T: Trait> Schedule<T> {
+impl<T: Config> Schedule<T> {
 	pub fn rules(&self, module: &elements::Module) -> impl rules::Rules + '_ {
 		ScheduleRules {
 			schedule: &self,
@@ -576,7 +576,7 @@ impl<T: Trait> Schedule<T> {
 	}
 }
 
-impl<'a, T: Trait> rules::Rules for ScheduleRules<'a, T> {
+impl<'a, T: Config> rules::Rules for ScheduleRules<'a, T> {
 	fn instruction_cost(&self, instruction: &elements::Instruction) -> Option<u32> {
 		use parity_wasm::elements::Instruction::*;
 		let w = &self.schedule.instruction_weights;
diff --git a/frame/contracts/src/storage.rs b/frame/contracts/src/storage.rs
index acd788796150d..c9eeba4633a10 100644
--- a/frame/contracts/src/storage.rs
+++ b/frame/contracts/src/storage.rs
@@ -18,7 +18,7 @@
 
 use crate::{
 	exec::{AccountIdOf, StorageKey},
-	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Trait, TrieId,
+	AliveContractInfo, BalanceOf, CodeHash, ContractInfo, ContractInfoOf, Config, TrieId,
 	AccountCounter,
 };
 use sp_std::prelude::*;
@@ -37,7 +37,7 @@ pub struct Storage<T>(PhantomData<T>);
 
 impl<T> Storage<T>
 where
-	T: Trait,
+	T: Config,
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
 	/// Reads a storage kv pair of a contract.
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 6a0476096c8c0..44ddb8c2c65cb 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -16,8 +16,8 @@
 
 use crate::{
 	BalanceOf, ContractInfo, ContractInfoOf, GenesisConfig, Module,
-	RawAliveContractInfo, RawEvent, Trait, Schedule, gas::Gas,
-	Error, Config, RuntimeReturnCode, storage::Storage,
+	RawAliveContractInfo, RawEvent, Config, Schedule, gas::Gas,
+	Error, ConfigCache, RuntimeReturnCode, storage::Storage,
 	exec::AccountIdOf,
 };
 use assert_matches::assert_matches;
@@ -110,7 +110,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 	pub static ExistentialDeposit: u64 = 0;
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -137,7 +137,7 @@ impl frame_system::Trait for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = MetaEvent;
@@ -149,7 +149,7 @@ impl pallet_balances::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 1;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -176,7 +176,7 @@ impl Convert<Weight, BalanceOf<Self>> for Test {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Time = Timestamp;
 	type Randomness = Randomness;
 	type Currency = Balances;
@@ -251,7 +251,7 @@ fn compile_module<T>(
 	fixture_name: &str,
 ) -> wat::Result<(Vec<u8>, <T::Hashing as Hash>::Output)>
 where
-	T: frame_system::Trait,
+	T: frame_system::Config,
 {
 	let fixture_path = ["fixtures/", fixture_name, ".wat"].concat();
 	let wasm_binary = wat::parse_file(fixture_path)?;
@@ -367,7 +367,7 @@ fn instantiate_and_call_and_deposit_event() {
 		.build()
 		.execute_with(|| {
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
-			let subsistence = super::Config::<Test>::subsistence_threshold_uncached();
+			let subsistence = super::ConfigCache::<Test>::subsistence_threshold_uncached();
 
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
@@ -472,7 +472,7 @@ fn deposit_event_max_value_limit() {
 				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer,
-				<Test as Trait>::MaxValueSize::get().encode(),
+				<Test as Config>::MaxValueSize::get().encode(),
 			));
 
 			// Call contract with too large a storage value.
@@ -482,7 +482,7 @@ fn deposit_event_max_value_limit() {
 					addr,
 					0,
 					GAS_LIMIT,
-					(<Test as Trait>::MaxValueSize::get() + 1).encode(),
+					(<Test as Config>::MaxValueSize::get() + 1).encode(),
 				),
 				Error::<Test>::ValueTooLarge,
 			);
@@ -591,7 +591,7 @@ fn storage_size() {
 				30_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -725,7 +725,7 @@ fn deduct_blocks() {
 				Origin::signed(ALICE),
 				30_000,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -830,7 +830,7 @@ fn claim_surcharge(blocks: u64, trigger_call: impl Fn(AccountIdOf<Test>) -> bool
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -869,7 +869,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -911,7 +911,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 				1_000,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(100u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(100u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -960,14 +960,14 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
 			// Create
 			let _ = Balances::deposit_creating(&ALICE, 1_000_000);
 			let subsistence_threshold =
-				Balances::minimum_balance() + <Test as Trait>::TombstoneDeposit::get();
+				Balances::minimum_balance() + <Test as Config>::TombstoneDeposit::get();
 			assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm.clone()));
 			assert_ok!(Contracts::instantiate(
 				Origin::signed(ALICE),
 				50 + subsistence_threshold,
 				GAS_LIMIT,
 				code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1039,7 +1039,7 @@ fn call_removed_contract() {
 				Origin::signed(ALICE),
 				100,
 				GAS_LIMIT, code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(1_000u32).encode(), // rent allowance
+				<Test as pallet_balances::Config>::Balance::from(1_000u32).encode(), // rent allowance
 				vec![],
 			));
 			let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
@@ -1177,7 +1177,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				set_rent_code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(0u32).encode(),
+				<Test as pallet_balances::Config>::Balance::from(0u32).encode(),
 				vec![],
 			));
 			let addr_bob = Contracts::contract_address(&ALICE, &set_rent_code_hash, &[]);
@@ -1227,7 +1227,7 @@ fn restoration(test_different_storage: bool, test_restore_to_with_dirty_storage:
 				30_000,
 				GAS_LIMIT,
 				restoration_code_hash.into(),
-				<Test as pallet_balances::Trait>::Balance::from(0u32).encode(),
+				<Test as pallet_balances::Config>::Balance::from(0u32).encode(),
 				vec![],
 			));
 			let addr_django = Contracts::contract_address(&CHARLIE, &restoration_code_hash, &[]);
@@ -1384,7 +1384,7 @@ fn storage_max_value_limit() {
 				addr.clone(),
 				0,
 				GAS_LIMIT * 2, // we are copying a huge buffer
-				<Test as Trait>::MaxValueSize::get().encode(),
+				<Test as Config>::MaxValueSize::get().encode(),
 			));
 
 			// Call contract with too large a storage value.
@@ -1394,7 +1394,7 @@ fn storage_max_value_limit() {
 					addr,
 					0,
 					GAS_LIMIT,
-					(<Test as Trait>::MaxValueSize::get() + 1).encode(),
+					(<Test as Config>::MaxValueSize::get() + 1).encode(),
 				),
 				Error::<Test>::ValueTooLarge,
 			);
@@ -1709,7 +1709,7 @@ fn crypto_hashes() {
 fn transfer_return_code() {
 	let (wasm, code_hash) = compile_module::<Test>("transfer_return_code").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Config::<Test>::subsistence_threshold_uncached();
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), wasm));
 
@@ -1756,7 +1756,7 @@ fn call_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("call_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Config::<Test>::subsistence_threshold_uncached();
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 10 * subsistence);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_code));
@@ -1849,7 +1849,7 @@ fn instantiate_return_code() {
 	let (caller_code, caller_hash) = compile_module::<Test>("instantiate_return_code").unwrap();
 	let (callee_code, callee_hash) = compile_module::<Test>("ok_trap_revert").unwrap();
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let subsistence = Config::<Test>::subsistence_threshold_uncached();
+		let subsistence = ConfigCache::<Test>::subsistence_threshold_uncached();
 		let _ = Balances::deposit_creating(&ALICE, 10 * subsistence);
 		let _ = Balances::deposit_creating(&CHARLIE, 10 * subsistence);
 		assert_ok!(Contracts::put_code(Origin::signed(ALICE), caller_code));
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index a64f387097ed0..d90c7502b85e6 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -27,7 +27,7 @@
 //! Thus, before executing a contract it should be reinstrument with new schedule.
 
 use crate::wasm::{prepare, runtime::Env, PrefabWasmModule};
-use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Trait};
+use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Config};
 use sp_std::prelude::*;
 use sp_runtime::traits::Hash;
 use sp_core::crypto::UncheckedFrom;
@@ -37,7 +37,7 @@ use frame_support::StorageMap;
 /// as a result of this function.
 ///
 /// This function instruments the given code and caches it in the storage.
-pub fn save<T: Trait>(
+pub fn save<T: Config>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
 ) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
@@ -55,7 +55,7 @@ pub fn save<T: Trait>(
 /// This version neither checks nor instruments the passed in code. This is useful
 /// when code needs to be benchmarked without the injected instrumentation.
 #[cfg(feature = "runtime-benchmarks")]
-pub fn save_raw<T: Trait>(
+pub fn save_raw<T: Config>(
 	original_code: Vec<u8>,
 	schedule: &Schedule<T>,
 ) -> Result<CodeHash<T>, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
@@ -73,7 +73,7 @@ pub fn save_raw<T: Trait>(
 /// If the module was instrumented with a lower version of schedule than
 /// the current one given as an argument, then this function will perform
 /// re-instrumentation and update the cache in the storage.
-pub fn load<T: Trait>(
+pub fn load<T: Config>(
 	code_hash: &CodeHash<T>,
 	schedule: &Schedule<T>,
 ) -> Result<PrefabWasmModule, &'static str> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
diff --git a/frame/contracts/src/wasm/env_def/macros.rs b/frame/contracts/src/wasm/env_def/macros.rs
index 6741896102d40..cc61deb074b75 100644
--- a/frame/contracts/src/wasm/env_def/macros.rs
+++ b/frame/contracts/src/wasm/env_def/macros.rs
@@ -129,8 +129,8 @@ macro_rules! define_func {
 			args: &[sp_sandbox::Value],
 		) -> Result<sp_sandbox::ReturnValue, sp_sandbox::HostError>
 			where
-				<E::T as frame_system::Trait>::AccountId:
-					sp_core::crypto::UncheckedFrom<<E::T as frame_system::Trait>::Hash> +
+				<E::T as frame_system::Config>::AccountId:
+					sp_core::crypto::UncheckedFrom<<E::T as frame_system::Config>::Hash> +
 						AsRef<[u8]>
 		{
 			#[allow(unused)]
@@ -190,8 +190,8 @@ macro_rules! define_env {
 
 		impl<E: Ext> $crate::wasm::env_def::FunctionImplProvider<E> for $init_name
 		where
-			<E::T as frame_system::Trait>::AccountId:
-				sp_core::crypto::UncheckedFrom<<E::T as frame_system::Trait>::Hash> +
+			<E::T as frame_system::Config>::AccountId:
+				sp_core::crypto::UncheckedFrom<<E::T as frame_system::Config>::Hash> +
 					AsRef<[u8]>
 		{
 			fn impls<F: FnMut(&[u8], $crate::wasm::env_def::HostFunc<E>)>(f: &mut F) {
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index baa75ad49720c..7d7668d5ec6d2 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -17,7 +17,7 @@
 //! This module provides a means for executing contracts
 //! represented in wasm.
 
-use crate::{CodeHash, Schedule, Trait};
+use crate::{CodeHash, Schedule, Config};
 use crate::wasm::env_def::FunctionImplProvider;
 use crate::exec::Ext;
 use crate::gas::GasMeter;
@@ -68,17 +68,17 @@ pub struct WasmExecutable {
 }
 
 /// Loader which fetches `WasmExecutable` from the code cache.
-pub struct WasmLoader<'a, T: Trait> {
+pub struct WasmLoader<'a, T: Config> {
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> WasmLoader<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
+impl<'a, T: Config> WasmLoader<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	pub fn new(schedule: &'a Schedule<T>) -> Self {
 		WasmLoader { schedule }
 	}
 }
 
-impl<'a, T: Trait> crate::exec::Loader<T> for WasmLoader<'a, T>
+impl<'a, T: Config> crate::exec::Loader<T> for WasmLoader<'a, T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
@@ -101,17 +101,17 @@ where
 }
 
 /// Implementation of `Vm` that takes `WasmExecutable` and executes it.
-pub struct WasmVm<'a, T: Trait> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
+pub struct WasmVm<'a, T: Config> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> WasmVm<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
+impl<'a, T: Config> WasmVm<'a, T> where T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]> {
 	pub fn new(schedule: &'a Schedule<T>) -> Self {
 		WasmVm { schedule }
 	}
 }
 
-impl<'a, T: Trait> crate::exec::Vm<T> for WasmVm<'a, T>
+impl<'a, T: Config> crate::exec::Vm<T> for WasmVm<'a, T>
 where
 	T::AccountId: UncheckedFrom<T::Hash> + AsRef<[u8]>
 {
@@ -462,8 +462,8 @@ mod tests {
 		gas_meter: &mut GasMeter<E::T>,
 	) -> ExecResult
 	where
-		<E::T as frame_system::Trait>::AccountId:
-			UncheckedFrom<<E::T as frame_system::Trait>::Hash> + AsRef<[u8]>
+		<E::T as frame_system::Config>::AccountId:
+			UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
 	{
 		use crate::exec::Vm;
 
diff --git a/frame/contracts/src/wasm/prepare.rs b/frame/contracts/src/wasm/prepare.rs
index 73c149d025d79..56e21d2ee664c 100644
--- a/frame/contracts/src/wasm/prepare.rs
+++ b/frame/contracts/src/wasm/prepare.rs
@@ -20,7 +20,7 @@
 
 use crate::wasm::env_def::ImportSatisfyCheck;
 use crate::wasm::PrefabWasmModule;
-use crate::{Schedule, Trait};
+use crate::{Schedule, Config};
 
 use parity_wasm::elements::{self, Internal, External, MemoryType, Type, ValueType};
 use pwasm_utils;
@@ -34,13 +34,13 @@ pub const IMPORT_MODULE_FN: &str = "seal0";
 /// compiler toolchains might not support specifying other modules than "env" for memory imports.
 pub const IMPORT_MODULE_MEMORY: &str = "env";
 
-struct ContractModule<'a, T: Trait> {
+struct ContractModule<'a, T: Config> {
 	/// A deserialized module. The module is valid (this is Guaranteed by `new` method).
 	module: elements::Module,
 	schedule: &'a Schedule<T>,
 }
 
-impl<'a, T: Trait> ContractModule<'a, T> {
+impl<'a, T: Config> ContractModule<'a, T> {
 	/// Creates a new instance of `ContractModule`.
 	///
 	/// Returns `Err` if the `original_code` couldn't be decoded or
@@ -369,7 +369,7 @@ impl<'a, T: Trait> ContractModule<'a, T> {
 	}
 }
 
-fn get_memory_limits<T: Trait>(module: Option<&MemoryType>, schedule: &Schedule<T>)
+fn get_memory_limits<T: Config>(module: Option<&MemoryType>, schedule: &Schedule<T>)
 	-> Result<(u32, u32), &'static str>
 {
 	if let Some(memory_type) = module {
@@ -410,7 +410,7 @@ fn get_memory_limits<T: Trait>(module: Option<&MemoryType>, schedule: &Schedule<
 /// - all imported functions from the external environment matches defined by `env` module,
 ///
 /// The preprocessing includes injecting code for gas metering and metering the height of stack.
-pub fn prepare_contract<C: ImportSatisfyCheck, T: Trait>(
+pub fn prepare_contract<C: ImportSatisfyCheck, T: Config>(
 	original_code: &[u8],
 	schedule: &Schedule<T>,
 ) -> Result<PrefabWasmModule, &'static str> {
@@ -452,7 +452,7 @@ pub fn prepare_contract<C: ImportSatisfyCheck, T: Trait>(
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking {
 	use super::{
-		Trait, ContractModule, PrefabWasmModule, ImportSatisfyCheck, Schedule, get_memory_limits
+		Config, ContractModule, PrefabWasmModule, ImportSatisfyCheck, Schedule, get_memory_limits
 	};
 	use parity_wasm::elements::FunctionType;
 
@@ -463,7 +463,7 @@ pub mod benchmarking {
 	}
 
 	/// Prepare function that neither checks nor instruments the passed in code.
-	pub fn prepare_contract<T: Trait>(original_code: &[u8], schedule: &Schedule<T>)
+	pub fn prepare_contract<T: Config>(original_code: &[u8], schedule: &Schedule<T>)
 		-> Result<PrefabWasmModule, &'static str>
 	{
 		let contract_module = ContractModule::new(original_code, schedule)?;
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 90ea86f9cec36..ac1cb1f54d56f 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -17,7 +17,7 @@
 //! Environment definition of the wasm smart-contract runtime.
 
 use crate::{
-	HostFnWeights, Schedule, Trait, CodeHash, BalanceOf, Error,
+	HostFnWeights, Schedule, Config, CodeHash, BalanceOf, Error,
 	exec::{Ext, StorageKey, TopicOf},
 	gas::{Gas, GasMeter, Token, GasMeterResult},
 	wasm::env_def::ConvertibleToWasm,
@@ -193,7 +193,7 @@ pub enum RuntimeToken {
 	HashBlake128(u32),
 }
 
-impl<T: Trait> Token<T> for RuntimeToken
+impl<T: Config> Token<T> for RuntimeToken
 where
 	T::AccountId: UncheckedFrom<T::Hash>, T::AccountId: AsRef<[u8]>
 {
@@ -291,8 +291,8 @@ pub struct Runtime<'a, E: Ext + 'a> {
 impl<'a, E> Runtime<'a, E>
 where
 	E: Ext + 'a,
-	<E::T as frame_system::Trait>::AccountId:
-		UncheckedFrom<<E::T as frame_system::Trait>::Hash> + AsRef<[u8]>
+	<E::T as frame_system::Config>::AccountId:
+		UncheckedFrom<<E::T as frame_system::Config>::Hash> + AsRef<[u8]>
 {
 	pub fn new(
 		ext: &'a mut E,
@@ -709,7 +709,7 @@ define_env!(Env, <E: Ext>,
 		value_len: u32
 	) -> ReturnCode => {
 		ctx.charge_gas(RuntimeToken::Transfer)?;
-		let callee: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(account_ptr, account_len)?;
 		let value: BalanceOf<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(value_ptr, value_len)?;
@@ -762,7 +762,7 @@ define_env!(Env, <E: Ext>,
 		output_len_ptr: u32
 	) -> ReturnCode => {
 		ctx.charge_gas(RuntimeToken::CallBase(input_data_len))?;
-		let callee: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let callee: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(callee_ptr, callee_len)?;
 		let value: BalanceOf<<E as Ext>::T> = ctx.read_sandbox_memory_as(value_ptr, value_len)?;
 		let input_data = ctx.read_sandbox_memory(input_data_ptr, input_data_len)?;
@@ -922,7 +922,7 @@ define_env!(Env, <E: Ext>,
 		beneficiary_len: u32
 	) => {
 		ctx.charge_gas(RuntimeToken::Terminate)?;
-		let beneficiary: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let beneficiary: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(beneficiary_ptr, beneficiary_len)?;
 
 		if let Ok(_) = ctx.ext.terminate(&beneficiary).map_err(|e| ctx.store_err(e)) {
@@ -1169,7 +1169,7 @@ define_env!(Env, <E: Ext>,
 		delta_count: u32
 	) => {
 		ctx.charge_gas(RuntimeToken::RestoreTo(delta_count))?;
-		let dest: <<E as Ext>::T as frame_system::Trait>::AccountId =
+		let dest: <<E as Ext>::T as frame_system::Config>::AccountId =
 			ctx.read_sandbox_memory_as(dest_ptr, dest_len)?;
 		let code_hash: CodeHash<<E as Ext>::T> =
 			ctx.read_sandbox_memory_as(code_hash_ptr, code_hash_len)?;
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index 77bb83cf4d422..24c1273a44ffb 100644
--- a/frame/contracts/src/weights.rs
+++ b/frame/contracts/src/weights.rs
@@ -144,7 +144,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_contracts using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn update_schedule() -> Weight {
 		(35_214_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index b5de1a91c17ad..542bfaa79db11 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -34,21 +34,21 @@ const MAX_REFERENDUMS: u32 = 99;
 const MAX_SECONDERS: u32 = 100;
 const MAX_BYTES: u32 = 16_384;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = System::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
 }
 
-fn funded_account<T: Trait>(name: &'static str, index: u32) -> T::AccountId {
+fn funded_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 	let caller: T::AccountId = account(name, index, SEED);
 	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	caller
 }
 
-fn add_proposal<T: Trait>(n: u32) -> Result<T::Hash, &'static str> {
+fn add_proposal<T: Config>(n: u32) -> Result<T::Hash, &'static str> {
 	let other = funded_account::<T>("proposer", n);
 	let value = T::MinimumDeposit::get();
 	let proposal_hash: T::Hash = T::Hashing::hash_of(&n);
@@ -62,7 +62,7 @@ fn add_proposal<T: Trait>(n: u32) -> Result<T::Hash, &'static str> {
 	Ok(proposal_hash)
 }
 
-fn add_referendum<T: Trait>(n: u32) -> Result<ReferendumIndex, &'static str> {
+fn add_referendum<T: Config>(n: u32) -> Result<ReferendumIndex, &'static str> {
 	let proposal_hash: T::Hash = T::Hashing::hash_of(&n);
 	let vote_threshold = VoteThreshold::SimpleMajority;
 
@@ -84,7 +84,7 @@ fn add_referendum<T: Trait>(n: u32) -> Result<ReferendumIndex, &'static str> {
 	Ok(referendum_index)
 }
 
-fn account_vote<T: Trait>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
+fn account_vote<T: Config>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
 	let v = Vote {
 		aye: true,
 		conviction: Conviction::Locked1x,
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index fa8d07fd78db7..ce89259e55e8e 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Democracy Pallet
 //!
-//! - [`democracy::Trait`](./trait.Trait.html)
+//! - [`democracy::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -199,13 +199,13 @@ pub type PropIndex = u32;
 /// A referendum index.
 pub type ReferendumIndex = u32;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait + Sized {
+pub trait Config: frame_system::Config + Sized {
 	type Proposal: Parameter + Dispatchable<Origin=Self::Origin> + From<Call<Self>>;
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Currency type for this module.
 	type Currency: ReservableCurrency<Self::AccountId>
@@ -338,7 +338,7 @@ enum Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Democracy {
+	trait Store for Module<T: Config> as Democracy {
 		// TODO: Refactor public proposal queue into its own pallet.
 		// https://github.com/paritytech/substrate/issues/5322
 		/// The number of (public) proposals that have been made so far.
@@ -413,9 +413,9 @@ decl_storage! {
 decl_event! {
 	pub enum Event<T> where
 		Balance = BalanceOf<T>,
-		<T as frame_system::Trait>::AccountId,
-		<T as frame_system::Trait>::Hash,
-		<T as frame_system::Trait>::BlockNumber,
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash,
+		<T as frame_system::Config>::BlockNumber,
 	{
 		/// A motion has been proposed by a public account. \[proposal_index, deposit\]
 		Proposed(PropIndex, Balance),
@@ -461,7 +461,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Value too low
 		ValueLow,
 		/// Proposal does not exist
@@ -537,7 +537,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// The minimum period of locking and the period between a proposal being approved and enacted.
@@ -1168,7 +1168,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// exposed immutables.
 
 	/// Get the amount locked in support of `proposal`; `None` if proposal isn't a valid proposal
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index 25209901109fa..6e7b7cfcc6d13 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -92,7 +92,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -122,7 +122,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * MaximumBlockWeight::get();
 }
-impl pallet_scheduler::Trait for Test {
+impl pallet_scheduler::Config for Test {
 	type Event = Event;
 	type Origin = Origin;
 	type PalletsOrigin = OriginCaller;
@@ -135,7 +135,7 @@ impl pallet_scheduler::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = Event;
@@ -173,7 +173,7 @@ impl Contains<u64> for OneToFive {
 	fn add(_m: &u64) {}
 }
 
-impl super::Trait for Test {
+impl super::Config for Test {
 	type Proposal = Call;
 	type Event = Event;
 	type Currency = pallet_balances::Module<Self>;
@@ -242,7 +242,7 @@ fn set_balance_proposal(value: u64) -> Vec<u8> {
 fn set_balance_proposal_is_correctly_filtered_out() {
 	for i in 0..10 {
 		let call = Call::decode(&mut &set_balance_proposal(i)[..]).unwrap();
-		assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+		assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 	}
 }
 
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index e386e5fb55313..06899b47dea71 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -72,7 +72,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_democracy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose() -> Weight {
 		(87_883_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
diff --git a/frame/elections-phragmen/src/benchmarking.rs b/frame/elections-phragmen/src/benchmarking.rs
index e7c3719480b70..eaa5bbe9ed4fb 100644
--- a/frame/elections-phragmen/src/benchmarking.rs
+++ b/frame/elections-phragmen/src/benchmarking.rs
@@ -30,7 +30,7 @@ const BALANCE_FACTOR: u32 = 250;
 const MAX_VOTERS: u32 = 500;
 const MAX_CANDIDATES: u32 = 200;
 
-type Lookup<T> = <<T as frame_system::Trait>::Lookup as StaticLookup>::Source;
+type Lookup<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 
 macro_rules! whitelist {
 	($acc:ident) => {
@@ -41,7 +41,7 @@ macro_rules! whitelist {
 }
 
 /// grab new account with infinite balance.
-fn endowed_account<T: Trait>(name: &'static str, index: u32) -> T::AccountId {
+fn endowed_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 	let account: T::AccountId = account(name, index, 0);
 	let amount = default_stake::<T>(BALANCE_FACTOR);
 	let _ = T::Currency::make_free_balance_be(&account, amount);
@@ -53,28 +53,28 @@ fn endowed_account<T: Trait>(name: &'static str, index: u32) -> T::AccountId {
 }
 
 /// Account to lookup type of system trait.
-fn as_lookup<T: Trait>(account: T::AccountId) -> Lookup<T> {
+fn as_lookup<T: Config>(account: T::AccountId) -> Lookup<T> {
 	T::Lookup::unlookup(account)
 }
 
 /// Get a reasonable amount of stake based on the execution trait's configuration
-fn default_stake<T: Trait>(factor: u32) -> BalanceOf<T> {
+fn default_stake<T: Config>(factor: u32) -> BalanceOf<T> {
 	let factor = BalanceOf::<T>::from(factor);
 	T::Currency::minimum_balance() * factor
 }
 
 /// Get the current number of candidates.
-fn candidate_count<T: Trait>() -> u32 {
+fn candidate_count<T: Config>() -> u32 {
 	<Candidates<T>>::decode_len().unwrap_or(0usize) as u32
 }
 
 /// Get the number of votes of a voter.
-fn vote_count_of<T: Trait>(who: &T::AccountId) -> u32 {
+fn vote_count_of<T: Config>(who: &T::AccountId) -> u32 {
 	<Voting<T>>::get(who).1.len() as u32
 }
 
 /// A `DefunctVoter` struct with correct value
-fn defunct_for<T: Trait>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
+fn defunct_for<T: Config>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
 	DefunctVoter {
 		who: as_lookup::<T>(who.clone()),
 		candidate_count: candidate_count::<T>(),
@@ -83,7 +83,7 @@ fn defunct_for<T: Trait>(who: T::AccountId) -> DefunctVoter<Lookup<T>> {
 }
 
 /// Add `c` new candidates.
-fn submit_candidates<T: Trait>(c: u32, prefix: &'static str)
+fn submit_candidates<T: Config>(c: u32, prefix: &'static str)
 	-> Result<Vec<T::AccountId>, &'static str>
 {
 	(0..c).map(|i| {
@@ -97,7 +97,7 @@ fn submit_candidates<T: Trait>(c: u32, prefix: &'static str)
 }
 
 /// Add `c` new candidates with self vote.
-fn submit_candidates_with_self_vote<T: Trait>(c: u32, prefix: &'static str)
+fn submit_candidates_with_self_vote<T: Config>(c: u32, prefix: &'static str)
 	-> Result<Vec<T::AccountId>, &'static str>
 {
 	let candidates = submit_candidates::<T>(c, prefix)?;
@@ -110,7 +110,7 @@ fn submit_candidates_with_self_vote<T: Trait>(c: u32, prefix: &'static str)
 
 
 /// Submit one voter.
-fn submit_voter<T: Trait>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
+fn submit_voter<T: Config>(caller: T::AccountId, votes: Vec<T::AccountId>, stake: BalanceOf<T>)
 	-> Result<(), sp_runtime::DispatchError>
 {
 	<Elections<T>>::vote(RawOrigin::Signed(caller).into(), votes, stake)
@@ -118,7 +118,7 @@ fn submit_voter<T: Trait>(caller: T::AccountId, votes: Vec<T::AccountId>, stake:
 
 /// create `num_voter` voters who randomly vote for at most `votes` of `all_candidates` if
 /// available.
-fn distribute_voters<T: Trait>(mut all_candidates: Vec<T::AccountId>, num_voters: u32, votes: usize)
+fn distribute_voters<T: Config>(mut all_candidates: Vec<T::AccountId>, num_voters: u32, votes: usize)
 	-> Result<(), &'static str>
 {
 	let stake = default_stake::<T>(BALANCE_FACTOR);
@@ -138,7 +138,7 @@ fn distribute_voters<T: Trait>(mut all_candidates: Vec<T::AccountId>, num_voters
 
 /// Fill the seats of members and runners-up up until `m`. Note that this might include either only
 /// members, or members and runners-up.
-fn fill_seats_up_to<T: Trait>(m: u32) -> Result<Vec<T::AccountId>, &'static str> {
+fn fill_seats_up_to<T: Config>(m: u32) -> Result<Vec<T::AccountId>, &'static str> {
 	let _ = submit_candidates_with_self_vote::<T>(m, "fill_seats_up_to")?;
 	assert_eq!(<Elections<T>>::candidates().len() as u32, m, "wrong number of candidates.");
 	<Elections<T>>::do_phragmen();
@@ -158,7 +158,7 @@ fn fill_seats_up_to<T: Trait>(m: u32) -> Result<Vec<T::AccountId>, &'static str>
 }
 
 /// removes all the storage items to reverse any genesis state.
-fn clean<T: Trait>() {
+fn clean<T: Config>() {
 	<Members<T>>::kill();
 	<Candidates<T>>::kill();
 	<RunnersUp<T>>::kill();
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index 8279f9cf11f16..c4a71d6595f98 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -77,7 +77,7 @@
 //!
 //! ### Module Information
 //!
-//! - [`election_sp_phragmen::Trait`](./trait.Trait.html)
+//! - [`election_sp_phragmen::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 
@@ -112,9 +112,9 @@ pub use weights::WeightInfo;
 pub const MAXIMUM_VOTE: usize = 16;
 
 type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// An indication that the renouncing account currently has which of the below roles.
 #[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug)]
@@ -140,9 +140,9 @@ pub struct DefunctVoter<AccountId> {
 	pub candidate_count: u32
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.c
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Identifier for the elections-phragmen pallet's lock
 	type ModuleId: Get<LockIdentifier>;
@@ -193,7 +193,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as PhragmenElection {
+	trait Store for Module<T: Config> as PhragmenElection {
 		// ---- State
 		/// The current elected membership. Sorted based on account id.
 		pub Members get(fn members): Vec<(T::AccountId, BalanceOf<T>)>;
@@ -251,7 +251,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Cannot vote when no candidates or members exist.
 		UnableToVote,
 		/// Must vote for at least one candidate.
@@ -290,7 +290,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -667,7 +667,7 @@ decl_module! {
 decl_event!(
 	pub enum Event<T> where
 		Balance = BalanceOf<T>,
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// A new term with \[new_members\]. This indicates that enough candidates existed to run the
 		/// election, not that enough have has been elected. The inner value must be examined for
@@ -694,7 +694,7 @@ decl_event!(
 	}
 );
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Attempts to remove a member `who`. If a runner-up exists, it is used as the replacement and
 	/// Ok(true). is returned.
 	///
@@ -1027,7 +1027,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> Contains<T::AccountId> for Module<T> {
+impl<T: Config> Contains<T::AccountId> for Module<T> {
 	fn contains(who: &T::AccountId) -> bool {
 		Self::is_member(who)
 	}
@@ -1046,7 +1046,7 @@ impl<T: Trait> Contains<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> ContainsLengthBound for Module<T> {
+impl<T: Config> ContainsLengthBound for Module<T> {
 	fn min_len() -> usize { 0 }
 
 	/// Implementation uses a parameter type so calling is cost-free.
@@ -1076,7 +1076,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -1108,7 +1108,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();
@@ -1175,7 +1175,7 @@ mod tests {
 		pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type ModuleId = ElectionsPhragmenModuleId;
 		type Event = Event;
 		type Currency = Balances;
diff --git a/frame/elections-phragmen/src/weights.rs b/frame/elections-phragmen/src/weights.rs
index 2702aec0a01cb..48fd40e782e4f 100644
--- a/frame/elections-phragmen/src/weights.rs
+++ b/frame/elections-phragmen/src/weights.rs
@@ -59,7 +59,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_elections_phragmen using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vote(v: u32, ) -> Weight {
 		(89_627_000 as Weight)
 			.saturating_add((197_000 as Weight).saturating_mul(v as Weight))
diff --git a/frame/elections/src/lib.rs b/frame/elections/src/lib.rs
index dccc42f24417b..1490b6d86aeb4 100644
--- a/frame/elections/src/lib.rs
+++ b/frame/elections/src/lib.rs
@@ -139,9 +139,9 @@ pub const VOTER_SET_SIZE: usize = 64;
 /// NUmber of approvals grouped in one chunk.
 pub const APPROVAL_SET_SIZE: usize = 8;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// Index used to access chunks.
 type SetIndex = u32;
@@ -152,8 +152,8 @@ type ApprovalFlag = u32;
 /// Number of approval flags that can fit into [`ApprovalFlag`] type.
 const APPROVAL_FLAG_LEN: usize = 32;
 
-pub trait Trait: frame_system::Trait {
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+pub trait Config: frame_system::Config {
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Identifier for the elections pallet's lock
 	type ModuleId: Get<LockIdentifier>;
@@ -218,7 +218,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Elections {
+	trait Store for Module<T: Config> as Elections {
 		// ---- parameters
 
 		/// How long to give each top candidate to present themselves after the vote ends.
@@ -286,7 +286,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the elections module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Reporter must be a voter.
 		NotVoter,
 		/// Target for inactivity cleanup must be active.
@@ -345,7 +345,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// How much should be locked up in order to submit one's candidacy. A reasonable
@@ -706,7 +706,7 @@ decl_module! {
 }
 
 decl_event!(
-	pub enum Event<T> where <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where <T as frame_system::Config>::AccountId {
 		/// Reaped \[voter, reaper\].
 		VoterReaped(AccountId, AccountId),
 		/// Slashed \[reaper\].
@@ -719,7 +719,7 @@ decl_event!(
 	}
 );
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// exposed immutables.
 
 	/// True if we're currently in a presentation period.
diff --git a/frame/elections/src/mock.rs b/frame/elections/src/mock.rs
index 0d57089af5ef8..293074469c5d7 100644
--- a/frame/elections/src/mock.rs
+++ b/frame/elections/src/mock.rs
@@ -37,7 +37,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -68,7 +68,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -110,7 +110,7 @@ parameter_types!{
 	pub const ElectionModuleId: LockIdentifier = *b"py/elect";
 }
 
-impl elections::Trait for Test {
+impl elections::Config for Test {
 	type Event = Event;
 	type Currency = Balances;
 	type BadPresentation = ();
diff --git a/frame/elections/src/tests.rs b/frame/elections/src/tests.rs
index d3579ca337436..38a16953572f4 100644
--- a/frame/elections/src/tests.rs
+++ b/frame/elections/src/tests.rs
@@ -680,8 +680,8 @@ fn retracting_active_voter_should_slash_reporter() {
 		assert_ok!(Elections::end_block(System::block_number()));
 
 		assert_eq!(Elections::vote_index(), 2);
-		assert_eq!(<Test as Trait>::InactiveGracePeriod::get(), 1);
-		assert_eq!(<Test as Trait>::VotingPeriod::get(), 4);
+		assert_eq!(<Test as Config>::InactiveGracePeriod::get(), 1);
+		assert_eq!(<Test as Config>::VotingPeriod::get(), 4);
 		assert_eq!(Elections::voter_info(4), Some(VoterInfo { last_win: 1, last_active: 0, stake: 40, pot: 0 }));
 
 		assert_ok!(Elections::reap_inactive_voter(Origin::signed(4),
diff --git a/frame/example-offchain-worker/src/lib.rs b/frame/example-offchain-worker/src/lib.rs
index b64e3f8dd83f5..29e545ae2d97b 100644
--- a/frame/example-offchain-worker/src/lib.rs
+++ b/frame/example-offchain-worker/src/lib.rs
@@ -24,7 +24,7 @@
 //! Run `cargo doc --package pallet-example-offchain-worker --open` to view this module's
 //! documentation.
 //!
-//! - [`pallet_example_offchain_worker::Trait`](./trait.Trait.html)
+//! - [`pallet_example_offchain_worker::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -103,12 +103,12 @@ pub mod crypto {
 }
 
 /// This pallet's configuration trait
-pub trait Trait: CreateSignedTransaction<Call<Self>> {
+pub trait Config: CreateSignedTransaction<Call<Self>> {
 	/// The identifier type for an offchain worker.
 	type AuthorityId: AppCrypto<Self::Public, Self::Signature>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	/// The overarching dispatch call type.
 	type Call: From<Call<Self>>;
 
@@ -149,7 +149,7 @@ impl<T: SigningTypes> SignedPayload<T> for PricePayload<T::Public, T::BlockNumbe
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ExampleOffchainWorker {
+	trait Store for Module<T: Config> as ExampleOffchainWorker {
 		/// A vector of recently submitted prices.
 		///
 		/// This is used to calculate average price, should have bounded size.
@@ -165,7 +165,7 @@ decl_storage! {
 
 decl_event!(
 	/// Events generated by the module.
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// Event generated when new price is accepted to contribute to the average.
 		/// \[price, who\]
 		NewPrice(u32, AccountId),
@@ -174,7 +174,7 @@ decl_event!(
 
 decl_module! {
 	/// A public part of the pallet.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		/// Submit new price to the list.
@@ -310,7 +310,7 @@ enum TransactionType {
 ///
 /// This greatly helps with error messages, as the ones inside the macro
 /// can sometimes be hard to debug.
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Chooses which transaction type to send.
 	///
 	/// This function serves mostly to showcase `StorageValue` helper
@@ -679,7 +679,7 @@ impl<T: Trait> Module<T> {
 }
 
 #[allow(deprecated)] // ValidateUnsigned
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 
 	/// Validate unsigned call to this module.
diff --git a/frame/example-offchain-worker/src/tests.rs b/frame/example-offchain-worker/src/tests.rs
index 204b366964f47..809e3b7ba64ae 100644
--- a/frame/example-offchain-worker/src/tests.rs
+++ b/frame/example-offchain-worker/src/tests.rs
@@ -56,7 +56,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -118,7 +118,7 @@ parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type AuthorityId = crypto::TestAuthId;
 	type Call = Call<Test>;
@@ -282,7 +282,7 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 
 			let signature_valid = <PricePayload<
 				<Test as SigningTypes>::Public,
-				<Test as frame_system::Trait>::BlockNumber
+				<Test as frame_system::Config>::BlockNumber
 					> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
 
 			assert!(signature_valid);
@@ -335,7 +335,7 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 
 			let signature_valid = <PricePayload<
 				<Test as SigningTypes>::Public,
-				<Test as frame_system::Trait>::BlockNumber
+				<Test as frame_system::Config>::BlockNumber
 					> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
 
 			assert!(signature_valid);
diff --git a/frame/example-parallel/src/lib.rs b/frame/example-parallel/src/lib.rs
index 4b7ce72b4d40e..b616e3d49278a 100644
--- a/frame/example-parallel/src/lib.rs
+++ b/frame/example-parallel/src/lib.rs
@@ -34,15 +34,15 @@ use sp_std::vec::Vec;
 #[cfg(test)]
 mod tests;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 	/// The overarching dispatch call type.
 	type Call: From<Call<Self>>;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ExampleOffchainWorker {
+	trait Store for Module<T: Config> as ExampleOffchainWorker {
 		/// A vector of current participants
 		///
 		/// To enlist someone to participate, signed payload should be
@@ -87,7 +87,7 @@ impl EnlistedParticipant {
 
 decl_module! {
 	/// A public part of the pallet.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		/// Get the new event running.
diff --git a/frame/example-parallel/src/tests.rs b/frame/example-parallel/src/tests.rs
index 1da8c60388266..d2c376400136d 100644
--- a/frame/example-parallel/src/tests.rs
+++ b/frame/example-parallel/src/tests.rs
@@ -39,7 +39,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -73,7 +73,7 @@ parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type Call = Call<Test>;
 }
diff --git a/frame/example/src/lib.rs b/frame/example/src/lib.rs
index 103bcfe696868..fb84a48a8d2d3 100644
--- a/frame/example/src/lib.rs
+++ b/frame/example/src/lib.rs
@@ -63,7 +63,7 @@
 //! // Include the following links that shows what trait needs to be implemented to use the pallet
 //! // and the supported dispatchables that are documented in the Call enum.
 //!
-//! - \[`<INSERT_CUSTOM_PALLET_NAME>::Trait`](./trait.Trait.html)
+//! - \[`<INSERT_CUSTOM_PALLET_NAME>::Config`](./trait.Config.html)
 //! - \[`Call`](./enum.Call.html)
 //! - \[`Module`](./struct.Module.html)
 //!
@@ -212,7 +212,7 @@
 //! \```rust
 //! use <INSERT_CUSTOM_PALLET_NAME>;
 //!
-//! pub trait Trait: <INSERT_CUSTOM_PALLET_NAME>::Trait { }
+//! pub trait Config: <INSERT_CUSTOM_PALLET_NAME>::Config { }
 //! \```
 //!
 //! \### Simple Code Snippet
@@ -286,9 +286,9 @@ use sp_runtime::{
 // - The final weight of each dispatch is calculated as the argument of the call multiplied by the
 //   parameter given to the `WeightForSetDummy`'s constructor.
 // - assigns a dispatch class `operational` if the argument of the call is more than 1000.
-struct WeightForSetDummy<T: pallet_balances::Trait>(BalanceOf<T>);
+struct WeightForSetDummy<T: pallet_balances::Config>(BalanceOf<T>);
 
-impl<T: pallet_balances::Trait> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T>
+impl<T: pallet_balances::Config> WeighData<(&BalanceOf<T>,)> for WeightForSetDummy<T>
 {
 	fn weigh_data(&self, target: (&BalanceOf<T>,)) -> Weight {
 		let multiplier = self.0;
@@ -296,7 +296,7 @@ impl<T: pallet_balances::Trait> WeighData<(&BalanceOf<T>,)> for WeightForSetDumm
 	}
 }
 
-impl<T: pallet_balances::Trait> ClassifyDispatch<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
+impl<T: pallet_balances::Config> ClassifyDispatch<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
 	fn classify_dispatch(&self, target: (&BalanceOf<T>,)) -> DispatchClass {
 		if *target.0 > <BalanceOf<T>>::from(1000u32) {
 			DispatchClass::Operational
@@ -306,23 +306,23 @@ impl<T: pallet_balances::Trait> ClassifyDispatch<(&BalanceOf<T>,)> for WeightFor
 	}
 }
 
-impl<T: pallet_balances::Trait> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
+impl<T: pallet_balances::Config> PaysFee<(&BalanceOf<T>,)> for WeightForSetDummy<T> {
 	fn pays_fee(&self, _target: (&BalanceOf<T>,)) -> Pays {
 		Pays::Yes
 	}
 }
 
 /// A type alias for the balance type from this pallet's point of view.
-type BalanceOf<T> = <T as pallet_balances::Trait>::Balance;
+type BalanceOf<T> = <T as pallet_balances::Config>::Balance;
 
 /// Our pallet's configuration trait. All our types and constants go in here. If the
 /// pallet is dependent on specific other pallets, then their configuration traits
 /// should be added to our implied traits list.
 ///
-/// `frame_system::Trait` should always be included in our implied traits.
-pub trait Trait: pallet_balances::Trait {
+/// `frame_system::Config` should always be included in our implied traits.
+pub trait Config: pallet_balances::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 }
 
 decl_storage! {
@@ -333,7 +333,7 @@ decl_storage! {
 	// It is important to update your storage name so that your pallet's
 	// storage items are isolated from other pallets.
 	// ---------------------------------vvvvvvv
-	trait Store for Module<T: Trait> as Example {
+	trait Store for Module<T: Config> as Example {
 		// Any storage declarations of the form:
 		//   `pub? Name get(fn getter_name)? [config()|config(myname)] [build(|_| {...})] : <type> (= <new_default_value>)?;`
 		// where `<type>` is either:
@@ -371,7 +371,7 @@ decl_event!(
 	/// Events are a simple means of reporting specific conditions and
 	/// circumstances that have happened that users, Dapps and/or chain explorers would find
 	/// interesting and otherwise difficult to detect.
-	pub enum Event<T> where B = <T as pallet_balances::Trait>::Balance {
+	pub enum Event<T> where B = <T as pallet_balances::Config>::Balance {
 		// Just a normal `enum`, here's a dummy event to ensure it compiles.
 		/// Dummy event, just here so there's a generic type that's used.
 		Dummy(B),
@@ -414,7 +414,7 @@ decl_event!(
 // `ensure_root` and `ensure_none`.
 decl_module! {
 	// Simple declaration of the `Module` type. Lets the macro know what its working on.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// Deposit one of this pallet's events by using the default implementation.
 		/// It is also possible to provide a custom implementation.
 		/// For non-generic events, the generic parameter just needs to be dropped, so that it
@@ -548,7 +548,7 @@ decl_module! {
 // - Public interface. These are functions that are `pub` and generally fall into inspector
 // functions that do not write to storage and operation functions that do.
 // - Private functions. These are your usual private utilities unavailable to other pallets.
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// Add public immutables and private mutables.
 	#[allow(dead_code)]
 	fn accumulate_foo(origin: T::Origin, increase_by: T::Balance) -> DispatchResult {
@@ -571,7 +571,7 @@ impl<T: Trait> Module<T> {
 // decodable type that implements `SignedExtension`. See the trait definition for the full list of
 // bounds. As a convention, you can follow this approach to create an extension for your pallet:
 //   - If the extension does not carry any data, then use a tuple struct with just a `marker`
-//     (needed for the compiler to accept `T: Trait`) will suffice.
+//     (needed for the compiler to accept `T: Config`) will suffice.
 //   - Otherwise, create a tuple struct which contains the external data. Of course, for the entire
 //     struct to be decodable, each individual item also needs to be decodable.
 //
@@ -602,21 +602,21 @@ impl<T: Trait> Module<T> {
 /// Additionally, it drops any transaction with an encoded length higher than 200 bytes. No
 /// particular reason why, just to demonstrate the power of signed extensions.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct WatchDummy<T: Trait + Send + Sync>(PhantomData<T>);
+pub struct WatchDummy<T: Config + Send + Sync>(PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for WatchDummy<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for WatchDummy<T> {
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "WatchDummy")
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for WatchDummy<T>
+impl<T: Config + Send + Sync> SignedExtension for WatchDummy<T>
 where
-	<T as frame_system::Trait>::Call: IsSubType<Call<T>>,
+	<T as frame_system::Config>::Call: IsSubType<Call<T>>,
 {
 	const IDENTIFIER: &'static str = "WatchDummy";
 	type AccountId = T::AccountId;
-	type Call = <T as frame_system::Trait>::Call;
+	type Call = <T as frame_system::Config>::Call;
 	type AdditionalSigned = ();
 	type Pre = ();
 
@@ -744,7 +744,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -774,7 +774,7 @@ mod tests {
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
 	}
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type MaxLocks = ();
 		type Balance = u64;
 		type DustRemoval = ();
@@ -783,7 +783,7 @@ mod tests {
 		type AccountStore = System;
 		type WeightInfo = ();
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 	}
 	type System = frame_system::Module<Test>;
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index ccb5c2d262871..c91287df5b905 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -145,7 +145,7 @@ pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
 /// Main entry point for certain runtime actions as e.g. `execute_block`.
 ///
 /// Generic parameters:
-/// - `System`: Something that implements `frame_system::Trait`
+/// - `System`: Something that implements `frame_system::Config`
 /// - `Block`: The block type of the runtime
 /// - `Context`: The context that is used when checking an extrinsic.
 /// - `UnsignedValidator`: The unsigned transaction validator of the runtime.
@@ -158,7 +158,7 @@ pub struct Executive<System, Block, Context, UnsignedValidator, AllModules, OnRu
 );
 
 impl<
-	System: frame_system::Trait,
+	System: frame_system::Config,
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	UnsignedValidator,
@@ -185,7 +185,7 @@ where
 }
 
 impl<
-	System: frame_system::Trait,
+	System: frame_system::Config,
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	UnsignedValidator,
@@ -505,10 +505,10 @@ mod tests {
 			UnknownTransaction, TransactionSource, TransactionValidity
 		};
 
-		pub trait Trait: frame_system::Trait {}
+		pub trait Config: frame_system::Config {}
 
 		frame_support::decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+			pub struct Module<T: Config> for enum Call where origin: T::Origin {
 				#[weight = 100]
 				fn some_function(origin) {
 					// NOTE: does not make any different.
@@ -555,7 +555,7 @@ mod tests {
 			}
 		}
 
-		impl<T: Trait> sp_runtime::traits::ValidateUnsigned for Module<T> {
+		impl<T: Config> sp_runtime::traits::ValidateUnsigned for Module<T> {
 			type Call = Call<T>;
 
 			fn validate_unsigned(
@@ -594,7 +594,7 @@ mod tests {
 			write: 100,
 		};
 	}
-	impl frame_system::Trait for Runtime {
+	impl frame_system::Config for Runtime {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -626,7 +626,7 @@ mod tests {
 	parameter_types! {
 		pub const ExistentialDeposit: Balance = 1;
 	}
-	impl pallet_balances::Trait for Runtime {
+	impl pallet_balances::Config for Runtime {
 		type Balance = Balance;
 		type Event = Event;
 		type DustRemoval = ();
@@ -639,13 +639,13 @@ mod tests {
 	parameter_types! {
 		pub const TransactionByteFee: Balance = 0;
 	}
-	impl pallet_transaction_payment::Trait for Runtime {
+	impl pallet_transaction_payment::Config for Runtime {
 		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = IdentityFee<Balance>;
 		type FeeMultiplierUpdate = ();
 	}
-	impl custom::Trait for Runtime {}
+	impl custom::Config for Runtime {}
 
 	pub struct RuntimeVersion;
 	impl frame_support::traits::Get<sp_version::RuntimeVersion> for RuntimeVersion {
@@ -668,8 +668,8 @@ mod tests {
 	type TestXt = sp_runtime::testing::TestXt<Call, SignedExtra>;
 	type TestBlock = Block<TestXt>;
 	type TestUncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<
-		<Runtime as frame_system::Trait>::AccountId,
-		<Runtime as frame_system::Trait>::Call,
+		<Runtime as frame_system::Config>::AccountId,
+		<Runtime as frame_system::Config>::Call,
 		(),
 		SignedExtra,
 	>;
@@ -715,9 +715,9 @@ mod tests {
 			balances: vec![(1, 211)],
 		}.assimilate_storage(&mut t).unwrap();
 		let xt = TestXt::new(Call::Balances(BalancesCall::transfer(2, 69)), sign_extra(1, 0, 0));
-		let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Trait>::ExtrinsicBaseWeight::get();
+		let weight = xt.get_dispatch_info().weight + <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
 		let fee: Balance
-			= <Runtime as pallet_transaction_payment::Trait>::WeightToFee::calc(&weight);
+			= <Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 		let mut t = sp_io::TestExternalities::new(t);
 		t.execute_with(|| {
 			Executive::initialize_block(&Header::new(
@@ -818,7 +818,7 @@ mod tests {
 		let encoded = xt.encode();
 		let encoded_len = encoded.len() as Weight;
 		// on_initialize weight + block execution weight
-		let base_block_weight = 175 + <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+		let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockExecutionWeight::get();
 		let limit = AvailableBlockRatio::get() * MaximumBlockWeight::get() - base_block_weight;
 		let num_to_exhaust_block = limit / (encoded_len + 5);
 		t.execute_with(|| {
@@ -861,7 +861,7 @@ mod tests {
 		let mut t = new_test_ext(1);
 		t.execute_with(|| {
 			// Block execution weight + on_initialize weight from custom module
-			let base_block_weight = 175 + <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+			let base_block_weight = 175 + <Runtime as frame_system::Config>::BlockExecutionWeight::get();
 
 			Executive::initialize_block(&Header::new(
 				1,
@@ -879,7 +879,7 @@ mod tests {
 			assert!(Executive::apply_extrinsic(x2.clone()).unwrap().is_ok());
 
 			// default weight for `TestXt` == encoded length.
-			let extrinsic_weight = len as Weight + <Runtime as frame_system::Trait>::ExtrinsicBaseWeight::get();
+			let extrinsic_weight = len as Weight + <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
 			assert_eq!(
 				<frame_system::Module<Runtime>>::block_weight().total(),
 				base_block_weight + 3 * extrinsic_weight,
@@ -946,9 +946,9 @@ mod tests {
 					sign_extra(1, 0, 0),
 				);
 				let weight = xt.get_dispatch_info().weight
-					+ <Runtime as frame_system::Trait>::ExtrinsicBaseWeight::get();
+					+ <Runtime as frame_system::Config>::ExtrinsicBaseWeight::get();
 				let fee: Balance =
-					<Runtime as pallet_transaction_payment::Trait>::WeightToFee::calc(&weight);
+					<Runtime as pallet_transaction_payment::Config>::WeightToFee::calc(&weight);
 				Executive::initialize_block(&Header::new(
 					1,
 					H256::default(),
@@ -1106,7 +1106,7 @@ mod tests {
 			let runtime_upgrade_weight = <AllModules as OnRuntimeUpgrade>::on_runtime_upgrade();
 			let frame_system_on_initialize_weight = frame_system::Module::<Runtime>::on_initialize(block_number);
 			let on_initialize_weight = <AllModules as OnInitialize<u64>>::on_initialize(block_number);
-			let base_block_weight = <Runtime as frame_system::Trait>::BlockExecutionWeight::get();
+			let base_block_weight = <Runtime as frame_system::Config>::BlockExecutionWeight::get();
 
 			// Weights are recorded correctly
 			assert_eq!(
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index e9662a726c40e..72f1434b24a99 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -54,13 +54,13 @@ use sp_staking::{
 	SessionIndex,
 };
 
-use super::{Call, Module, Trait};
+use super::{Call, Module, Config};
 
 /// A trait with utility methods for handling equivocation reports in GRANDPA.
 /// The offence type is generic, and the trait provides , reporting an offence
 /// triggered by a valid equivocation report, and also for creating and
 /// submitting equivocation report extrinsics (useful only in offchain context).
-pub trait HandleEquivocation<T: Trait> {
+pub trait HandleEquivocation<T: Config> {
 	/// The offence type used for reporting offences on valid equivocation reports.
 	type Offence: GrandpaOffence<T::KeyOwnerIdentification>;
 
@@ -86,7 +86,7 @@ pub trait HandleEquivocation<T: Trait> {
 	fn block_author() -> Option<T::AccountId>;
 }
 
-impl<T: Trait> HandleEquivocation<T> for () {
+impl<T: Config> HandleEquivocation<T> for () {
 	type Offence = GrandpaEquivocationOffence<T::KeyOwnerIdentification>;
 
 	fn report_offence(
@@ -136,7 +136,7 @@ where
 	// We use the authorship pallet to fetch the current block author and use
 	// `offchain::SendTransactionTypes` for unsigned extrinsic creation and
 	// submission.
-	T: Trait + pallet_authorship::Trait + frame_system::offchain::SendTransactionTypes<Call<T>>,
+	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	// A system for reporting offences after valid equivocation reports are
 	// processed.
 	R: ReportOffence<T::AccountId, T::KeyOwnerIdentification, O>,
@@ -187,7 +187,7 @@ pub struct GrandpaTimeSlot {
 /// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
 /// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
 /// guarantees that only block authors can include unsigned equivocation reports.
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::report_equivocation_unsigned(equivocation_proof, _) = call {
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index fe836ac913cb6..15099672d0d2d 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -67,9 +67,9 @@ pub use equivocation::{
 	HandleEquivocation,
 };
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The event type of this module.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The function call.
 	type Call: From<Call<Self>>;
@@ -188,7 +188,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Attempt to signal GRANDPA pause when the authority set isn't live
 		/// (either paused or already pending pause).
 		PauseFailed,
@@ -209,7 +209,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as GrandpaFinality {
+	trait Store for Module<T: Config> as GrandpaFinality {
 		/// State of the current authority set.
 		State get(fn state): StoredState<T::BlockNumber> = StoredState::Live;
 
@@ -241,7 +241,7 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -372,7 +372,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get the current set of authorities, along with their respective weights.
 	pub fn grandpa_authorities() -> AuthorityList {
 		storage::unhashed::get_or_default::<VersionedAuthorityList>(GRANDPA_AUTHORITIES_KEY).into()
@@ -583,12 +583,12 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T>
-	where T: pallet_session::Trait
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T>
+	where T: pallet_session::Config
 {
 	type Key = AuthorityId;
 
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index d3461eec12dc4..fd731c9cda3d4 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -19,7 +19,7 @@
 
 #![cfg(test)]
 
-use crate::{AuthorityId, AuthorityList, ConsensusLog, Module, Trait};
+use crate::{AuthorityId, AuthorityList, ConsensusLog, Module, Config};
 use ::grandpa as finality_grandpa;
 use codec::Encode;
 use frame_support::{
@@ -79,7 +79,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -122,7 +122,7 @@ parameter_types! {
 }
 
 /// Custom `SessionHandler` since we use `TestSessionKeys` as `Keys`.
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type Event = TestEvent;
 	type ValidatorId = u64;
 	type ValidatorIdOf = pallet_staking::StashOf<Self>;
@@ -135,7 +135,7 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<u64, u128>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
@@ -144,7 +144,7 @@ parameter_types! {
 	pub const UncleGenerations: u64 = 0;
 }
 
-impl pallet_authorship::Trait for Test {
+impl pallet_authorship::Config for Test {
 	type FindAuthor = ();
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -155,7 +155,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u128 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
@@ -169,7 +169,7 @@ parameter_types! {
 	pub const MinimumPeriod: u64 = 3;
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -198,7 +198,7 @@ parameter_types! {
 	pub const StakingUnsignedPriority: u64 = u64::max_value() / 2;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = TestEvent;
@@ -227,14 +227,14 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Test {
+impl pallet_offences::Config for Test {
 	type Event = TestEvent;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 
diff --git a/frame/grandpa/src/tests.rs b/frame/grandpa/src/tests.rs
index 4916808fe000f..4963d7e6b6d46 100644
--- a/frame/grandpa/src/tests.rs
+++ b/frame/grandpa/src/tests.rs
@@ -850,7 +850,7 @@ fn report_equivocation_has_valid_weight() {
 	// but there's a lower bound of 100 validators.
 	assert!(
 		(1..=100)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] == w[1])
@@ -860,7 +860,7 @@ fn report_equivocation_has_valid_weight() {
 	// with every extra validator.
 	assert!(
 		(100..=1000)
-			.map(<Test as Trait>::WeightInfo::report_equivocation)
+			.map(<Test as Config>::WeightInfo::report_equivocation)
 			.collect::<Vec<_>>()
 			.windows(2)
 			.all(|w| w[0] < w[1])
diff --git a/frame/identity/src/benchmarking.rs b/frame/identity/src/benchmarking.rs
index d7876514452e2..0176986c8224c 100644
--- a/frame/identity/src/benchmarking.rs
+++ b/frame/identity/src/benchmarking.rs
@@ -29,16 +29,16 @@ use crate::Module as Identity;
 
 const SEED: u32 = 0;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = frame_system::Module::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
 }
 
 // Adds `r` registrars to the Identity Pallet. These registrars will have set fees and fields.
-fn add_registrars<T: Trait>(r: u32) -> Result<(), &'static str> {
+fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
 	for i in 0..r {
 		let registrar: T::AccountId = account("registrar", i, SEED);
 		let _ = T::Currency::make_free_balance_be(&registrar, BalanceOf::<T>::max_value());
@@ -57,7 +57,7 @@ fn add_registrars<T: Trait>(r: u32) -> Result<(), &'static str> {
 
 // Create `s` sub-accounts for the identity of `who` and return them.
 // Each will have 32 bytes of raw data added to it.
-fn create_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
+fn create_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let mut subs = Vec::new();
 	let who_origin = RawOrigin::Signed(who.clone());
 	let data = Data::Raw(vec![0; 32]);
@@ -77,7 +77,7 @@ fn create_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::A
 
 // Adds `s` sub-accounts to the identity of `who`. Each will have 32 bytes of raw data added to it.
 // This additionally returns the vector of sub-accounts so it can be modified if needed.
-fn add_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
+fn add_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
 	let who_origin = RawOrigin::Signed(who.clone());
 	let subs = create_sub_accounts::<T>(who, s)?;
 
@@ -88,7 +88,7 @@ fn add_sub_accounts<T: Trait>(who: &T::AccountId, s: u32) -> Result<Vec<(T::Acco
 
 // This creates an `IdentityInfo` object with `num_fields` extra fields.
 // All data is pre-populated with some arbitrary bytes.
-fn create_identity_info<T: Trait>(num_fields: u32) -> IdentityInfo {
+fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo {
 	let data = Data::Raw(vec![0; 32]);
 
 	let info = IdentityInfo {
@@ -121,7 +121,7 @@ benchmarks! {
 			// Create their main identity with x additional fields
 			let info = create_identity_info::<T>(x);
 			let caller: T::AccountId = whitelisted_caller();
-			let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller));
+			let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller));
 			Identity::<T>::set_identity(caller_origin, info)?;
 		};
 	}
@@ -143,7 +143,7 @@ benchmarks! {
 			// The target user
 			let caller: T::AccountId = whitelisted_caller();
 			let caller_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(caller.clone());
-			let caller_origin: <T as frame_system::Trait>::Origin = RawOrigin::Signed(caller.clone()).into();
+			let caller_origin: <T as frame_system::Config>::Origin = RawOrigin::Signed(caller.clone()).into();
 			let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
 			// Add an initial identity
@@ -200,7 +200,7 @@ benchmarks! {
 
 	clear_identity {
 		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller.clone()));
+		let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller.clone()));
 		let caller_lookup = <T::Lookup as StaticLookup>::unlookup(caller.clone());
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
@@ -237,7 +237,7 @@ benchmarks! {
 
 	cancel_request {
 		let caller: T::AccountId = whitelisted_caller();
-		let caller_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(caller.clone()));
+		let caller_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(caller.clone()));
 		let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 
 		let r in ...;
@@ -300,7 +300,7 @@ benchmarks! {
 	provide_judgement {
 		// The user
 		let user: T::AccountId = account("user", r, SEED);
-		let user_origin = <T as frame_system::Trait>::Origin::from(RawOrigin::Signed(user.clone()));
+		let user_origin = <T as frame_system::Config>::Origin::from(RawOrigin::Signed(user.clone()));
 		let user_lookup = <T::Lookup as StaticLookup>::unlookup(user.clone());
 		let _ = T::Currency::make_free_balance_be(&user, BalanceOf::<T>::max_value());
 
@@ -328,7 +328,7 @@ benchmarks! {
 		let x in _ .. _ => {};
 
 		let target: T::AccountId = account("target", 0, SEED);
-		let target_origin: <T as frame_system::Trait>::Origin = RawOrigin::Signed(target.clone()).into();
+		let target_origin: <T as frame_system::Config>::Origin = RawOrigin::Signed(target.clone()).into();
 		let target_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(target.clone());
 		let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());
 
diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs
index 0ee6563a5611d..c0afffc0524c7 100644
--- a/frame/identity/src/lib.rs
+++ b/frame/identity/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Identity Module
 //!
-//! - [`identity::Trait`](./trait.Trait.html)
+//! - [`identity::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -68,7 +68,7 @@
 //! * `kill_identity` - Forcibly remove the associated identity; the deposit is lost.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -91,12 +91,12 @@ use frame_support::{
 use frame_system::ensure_signed;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The currency trait.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -399,7 +399,7 @@ pub struct RegistrarInfo<
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Identity {
+	trait Store for Module<T: Config> as Identity {
 		/// Information that is pertinent to identify the entity behind an account.
 		///
 		/// TWOX-NOTE: OK ― `AccountId` is a secure hash.
@@ -428,7 +428,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
 		/// A name was set or reset (which will remove all judgements). \[who\]
 		IdentitySet(AccountId),
 		/// A name was cleared, and the given balance returned. \[who, deposit\]
@@ -456,7 +456,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the identity module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Too many subs-accounts.
 		TooManySubAccounts,
 		/// Account isn't found.
@@ -494,7 +494,7 @@ decl_error! {
 
 decl_module! {
 	/// Identity module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The amount held on deposit for a registered identity.
 		const BasicDeposit: BalanceOf<T> = T::BasicDeposit::get();
 
@@ -1125,7 +1125,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get the subs of an account.
 	pub fn subs(who: &T::AccountId) -> Vec<(T::AccountId, Data)> {
 		SubsOf::<T>::get(who).1
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 0637ac6aafc5f..aefce1f8ff6f3 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -42,7 +42,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -72,7 +72,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type Balance = u64;
 	type Event = ();
 	type DustRemoval = ();
@@ -103,7 +103,7 @@ type EnsureTwoOrRoot = EnsureOneOf<
 	EnsureRoot<u64>,
 	EnsureSignedBy<Two, u64>
 >;
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type Currency = Balances;
 	type Slashed = ();
diff --git a/frame/identity/src/weights.rs b/frame/identity/src/weights.rs
index 44efbb31035ef..431a26cc0960d 100644
--- a/frame/identity/src/weights.rs
+++ b/frame/identity/src/weights.rs
@@ -64,7 +64,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_identity using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn add_registrar(r: u32, ) -> Weight {
 		(28_965_000 as Weight)
 			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index b92be023ce480..452a9f26ed7d0 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -34,7 +34,7 @@ use crate::Module as ImOnline;
 const MAX_KEYS: u32 = 1000;
 const MAX_EXTERNAL_ADDRESSES: u32 = 100;
 
-pub fn create_heartbeat<T: Trait>(k: u32, e: u32) ->
+pub fn create_heartbeat<T: Config>(k: u32, e: u32) ->
 	Result<(crate::Heartbeat<T::BlockNumber>, <T::AuthorityId as RuntimeAppPublic>::Signature), &'static str>
 {
 	let mut keys = Vec::new();
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 2d3693d127207..09cb2afa22be4 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -30,7 +30,7 @@
 //! as the [NetworkState](../../client/offchain/struct.NetworkState.html).
 //! It is submitted as an Unsigned Transaction via off-chain workers.
 //!
-//! - [`im_online::Trait`](./trait.Trait.html)
+//! - [`im_online::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -47,10 +47,10 @@
 //! use frame_system::ensure_signed;
 //! use pallet_im_online::{self as im_online};
 //!
-//! pub trait Trait: im_online::Trait {}
+//! pub trait Config: im_online::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn is_online(origin, authority_index: u32) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
@@ -227,12 +227,12 @@ pub struct Heartbeat<BlockNumber>
 	pub validators_len: u32,
 }
 
-pub trait Trait: SendTransactionTypes<Call<Self>> + pallet_session::historical::Trait {
+pub trait Config: SendTransactionTypes<Call<Self>> + pallet_session::historical::Config {
 	/// The identifier type for an authority.
 	type AuthorityId: Member + Parameter + RuntimeAppPublic + Default + Ord;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// An expected duration of the session.
 	///
@@ -262,7 +262,7 @@ pub trait Trait: SendTransactionTypes<Call<Self>> + pallet_session::historical::
 
 decl_event!(
 	pub enum Event<T> where
-		<T as Trait>::AuthorityId,
+		<T as Config>::AuthorityId,
 		IdentificationTuple = IdentificationTuple<T>,
 	{
 		/// A new heartbeat was received from `AuthorityId` \[authority_id\]
@@ -275,7 +275,7 @@ decl_event!(
 );
 
 decl_storage! {
-	trait Store for Module<T: Trait> as ImOnline {
+	trait Store for Module<T: Config> as ImOnline {
 		/// The block number after which it's ok to send heartbeats in current session.
 		///
 		/// At the beginning of each session we set this to a value that should
@@ -307,7 +307,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the im-online module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Non existent public key.
 		InvalidKey,
 		/// Duplicated heartbeat.
@@ -316,7 +316,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -332,7 +332,7 @@ decl_module! {
 		/// # </weight>
 		// NOTE: the weight includes the cost of validate_unsigned as it is part of the cost to
 		// import block with such an extrinsic.
-		#[weight = <T as Trait>::WeightInfo::validate_unsigned_and_then_heartbeat(
+		#[weight = <T as Config>::WeightInfo::validate_unsigned_and_then_heartbeat(
 			heartbeat.validators_len as u32,
 			heartbeat.network_state.external_addresses.len() as u32,
 		)]
@@ -393,11 +393,11 @@ decl_module! {
 	}
 }
 
-type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Trait>::BlockNumber>>;
+type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::BlockNumber>>;
 
 /// Keep track of number of authored blocks per authority, uncles are counted as
 /// well since they're a valid proof of being online.
-impl<T: Trait + pallet_authorship::Trait> pallet_authorship::EventHandler<T::ValidatorId, T::BlockNumber> for Module<T> {
+impl<T: Config + pallet_authorship::Config> pallet_authorship::EventHandler<T::ValidatorId, T::BlockNumber> for Module<T> {
 	fn note_author(author: T::ValidatorId) {
 		Self::note_authorship(author);
 	}
@@ -407,7 +407,7 @@ impl<T: Trait + pallet_authorship::Trait> pallet_authorship::EventHandler<T::Val
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Returns `true` if a heartbeat has been received for the authority at
 	/// `authority_index` in the authorities series or if the authority has
 	/// authored at least one block, during the current session. Otherwise
@@ -610,11 +610,11 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> {
 	type Public = T::AuthorityId;
 }
 
-impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = T::AuthorityId;
 
 	fn on_genesis_session<'a, I: 'a>(validators: I)
@@ -677,7 +677,7 @@ impl<T: Trait> pallet_session::OneSessionHandler<T::AccountId> for Module<T> {
 /// Invalid transaction custom error. Returned when validators_len field in heartbeat is incorrect.
 const INVALID_VALIDATORS_LEN: u8 = 10;
 
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 
 	fn validate_unsigned(
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index dae4bb3447e56..9a049a4718811 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -21,7 +21,7 @@
 
 use std::cell::RefCell;
 
-use crate::{Module, Trait};
+use crate::{Module, Config};
 use sp_runtime::Perbill;
 use sp_staking::{SessionIndex, offence::{ReportOffence, OffenceError}};
 use sp_runtime::testing::{Header, UintAuthorityId, TestXt};
@@ -109,7 +109,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -146,7 +146,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 }
 
-impl pallet_session::Trait for Runtime {
+impl pallet_session::Config for Runtime {
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Runtime, TestSessionManager>;
 	type SessionHandler = (ImOnline, );
@@ -159,7 +159,7 @@ impl pallet_session::Trait for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Runtime {
+impl pallet_session::historical::Config for Runtime {
 	type FullIdentification = u64;
 	type FullIdentificationOf = ConvertInto;
 }
@@ -168,7 +168,7 @@ parameter_types! {
 	pub const UncleGenerations: u32 = 5;
 }
 
-impl pallet_authorship::Trait for Runtime {
+impl pallet_authorship::Config for Runtime {
 	type FindAuthor = ();
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -179,7 +179,7 @@ parameter_types! {
 	pub const UnsignedPriority: u64 = 1 << 20;
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type AuthorityId = UintAuthorityId;
 	type Event = ();
 	type ReportUnresponsiveness = OffenceHandler;
diff --git a/frame/im-online/src/weights.rs b/frame/im-online/src/weights.rs
index f9df679bd2bea..c0f11c69c4b23 100644
--- a/frame/im-online/src/weights.rs
+++ b/frame/im-online/src/weights.rs
@@ -49,7 +49,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_im_online using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
 		(114_379_000 as Weight)
 			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs
index 6d467aa673445..18eb544984817 100644
--- a/frame/indices/src/lib.rs
+++ b/frame/indices/src/lib.rs
@@ -37,10 +37,10 @@ use frame_support::traits::{Currency, ReservableCurrency, Get, BalanceStatus::Re
 use frame_system::{ensure_signed, ensure_root};
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// The module's config trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Type used for storing an account's index; implies the maximum number of accounts the system
 	/// can hold.
 	type AccountIndex: Parameter + Member + Codec + Default + AtLeast32Bit + Copy;
@@ -52,14 +52,14 @@ pub trait Trait: frame_system::Trait {
 	type Deposit: Get<BalanceOf<Self>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Weight information for extrinsics in this pallet.
 	type WeightInfo: WeightInfo;
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Indices {
+	trait Store for Module<T: Config> as Indices {
 		/// The lookup from index to account.
 		pub Accounts build(|config: &GenesisConfig<T>|
 			config.indices.iter()
@@ -75,8 +75,8 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::AccountIndex
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::AccountIndex
 	{
 		/// A account index was assigned. \[index, who\]
 		IndexAssigned(AccountId, AccountIndex),
@@ -88,7 +88,7 @@ decl_event!(
 );
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The index was not already assigned.
 		NotAssigned,
 		/// The index is assigned to another account.
@@ -103,7 +103,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = frame_system {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system = frame_system {
 		/// The deposit needed for reserving an index.
 		const Deposit: BalanceOf<T> = T::Deposit::get();
 
@@ -275,7 +275,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	// PUBLIC IMMUTABLES
 
 	/// Lookup an T::AccountIndex to get an Id, if there's one there.
@@ -295,7 +295,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> StaticLookup for Module<T> {
+impl<T: Config> StaticLookup for Module<T> {
 	type Source = MultiAddress<T::AccountId, T::AccountIndex>;
 	type Target = T::AccountId;
 
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index cfbd2e38c3d3f..dbbde888c1666 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -23,7 +23,7 @@ use sp_runtime::testing::Header;
 use sp_runtime::Perbill;
 use sp_core::H256;
 use frame_support::{impl_outer_origin, impl_outer_event, parameter_types, weights::Weight};
-use crate::{self as indices, Module, Trait};
+use crate::{self as indices, Module, Config};
 use frame_system as system;
 use pallet_balances as balances;
 
@@ -49,7 +49,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = ();
@@ -81,7 +81,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -95,7 +95,7 @@ parameter_types! {
 	pub const Deposit: u64 = 1;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type AccountIndex = u64;
 	type Currency = Balances;
 	type Deposit = Deposit;
diff --git a/frame/indices/src/weights.rs b/frame/indices/src/weights.rs
index 36d990cec52aa..96470625329f0 100644
--- a/frame/indices/src/weights.rs
+++ b/frame/indices/src/weights.rs
@@ -53,7 +53,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_indices using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn claim() -> Weight {
 		(53_799_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 06188c42b21bd..60cd7ae1eda21 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -30,9 +30,9 @@ use frame_support::{
 };
 use frame_system::ensure_signed;
 
-pub trait Trait<I=DefaultInstance>: frame_system::Trait {
+pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Required origin for adding a member (though can always be Root).
 	type AddOrigin: EnsureOrigin<Self::Origin>;
@@ -59,7 +59,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Membership {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Membership {
 		/// The current membership, stored as an ordered Vec.
 		Members get(fn members): Vec<T::AccountId>;
 
@@ -80,8 +80,8 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait<I>>::Event,
+		<T as frame_system::Config>::AccountId,
+		<T as Config<I>>::Event,
 	{
 		/// The given member was added; see the transaction for who.
 		MemberAdded,
@@ -100,7 +100,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the nicks module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Already a member.
 		AlreadyMember,
 		/// Not a member.
@@ -109,7 +109,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance>
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
 		for enum Call
 		where origin: T::Origin
 	{
@@ -253,7 +253,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	fn rejig_prime(members: &[T::AccountId]) {
 		if let Some(prime) = Prime::<T, I>::get() {
 			match members.binary_search(&prime) {
@@ -264,7 +264,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> Contains<T::AccountId> for Module<T, I> {
 	fn sorted_members() -> Vec<T::AccountId> {
 		Self::members()
 	}
@@ -300,7 +300,7 @@ mod tests {
 		pub static Members: Vec<u64> = vec![];
 		pub static Prime: Option<u64> = None;
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -359,7 +359,7 @@ mod tests {
 		}
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type AddOrigin = EnsureSignedBy<One, u64>;
 		type RemoveOrigin = EnsureSignedBy<Two, u64>;
diff --git a/frame/multisig/src/benchmarking.rs b/frame/multisig/src/benchmarking.rs
index bf89ec8b09bd4..0b549b3d94717 100644
--- a/frame/multisig/src/benchmarking.rs
+++ b/frame/multisig/src/benchmarking.rs
@@ -29,7 +29,7 @@ use crate::Module as Multisig;
 
 const SEED: u32 = 0;
 
-fn setup_multi<T: Trait>(s: u32, z: u32)
+fn setup_multi<T: Config>(s: u32, z: u32)
 	-> Result<(Vec<T::AccountId>, Vec<u8>), &'static str>
 {
 	let mut signatories: Vec<T::AccountId> = Vec::new();
@@ -42,7 +42,7 @@ fn setup_multi<T: Trait>(s: u32, z: u32)
 	}
 	signatories.sort();
 	// Must first convert to outer call type.
-	let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
+	let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
 	let call_data = call.encode();
 	return Ok((signatories, call_data))
 }
@@ -55,7 +55,7 @@ benchmarks! {
 		let z in 0 .. 10_000;
 		let max_signatories = T::MaxSignatories::get().into();
 		let (mut signatories, _) = setup_multi::<T>(max_signatories, z)?;
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![0; z as usize]).into();
 		let call_hash = call.using_encoded(blake2_256);
 		let multi_account_id = Multisig::<T>::multi_account_id(&signatories, 1);
 		let caller = signatories.pop().ok_or("signatories should have len 2 or more")?;
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 873508259a8d7..b39b979f999d0 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Multisig Module
 //! A module for doing multisig dispatch.
 //!
-//! - [`multisig::Trait`](./trait.Trait.html)
+//! - [`multisig::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -41,7 +41,7 @@
 //! * `cancel_as_multi` - Cancel a call from a composite origin.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -62,14 +62,14 @@ use frame_system::{self as system, ensure_signed, RawOrigin};
 use sp_runtime::{DispatchError, DispatchResult, traits::{Dispatchable, Zero}};
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 /// Just a bunch of bytes, but they should decode to a valid `Call`.
 pub type OpaqueCall = Vec<u8>;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
@@ -123,7 +123,7 @@ pub struct Multisig<BlockNumber, Balance, AccountId> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Multisig {
+	trait Store for Module<T: Config> as Multisig {
 		/// The set of open multisig operations.
 		pub Multisigs: double_map
 			hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) [u8; 32]
@@ -134,7 +134,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Threshold must be 2 or greater.
 		MinimumThreshold,
 		/// Call is already approved by this signatory.
@@ -169,8 +169,8 @@ decl_error! {
 decl_event! {
 	/// Events type.
 	pub enum Event<T> where
-		AccountId = <T as system::Trait>::AccountId,
-		BlockNumber = <T as system::Trait>::BlockNumber,
+		AccountId = <T as system::Config>::AccountId,
+		BlockNumber = <T as system::Config>::BlockNumber,
 		CallHash = [u8; 32]
 	{
 		/// A new multisig operation has begun. \[approving, multisig, call_hash\]
@@ -191,7 +191,7 @@ enum CallOrHash {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// Deposit one of this module's events by using the default implementation.
@@ -232,7 +232,7 @@ decl_module! {
 		)]
 		fn as_multi_threshold_1(origin,
 			other_signatories: Vec<T::AccountId>,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			let max_sigs = T::MaxSignatories::get() as usize;
@@ -443,7 +443,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Derive a multi-account ID from the sorted list of accounts and the threshold that are
 	/// required.
 	///
@@ -615,7 +615,7 @@ impl<T: Trait> Module<T> {
 	}
 
 	/// Attempt to decode and return the call, provided by the user or from storage.
-	fn get_call(hash: &[u8; 32], maybe_known: Option<&[u8]>) -> Option<(<T as Trait>::Call, usize)> {
+	fn get_call(hash: &[u8; 32], maybe_known: Option<&[u8]>) -> Option<(<T as Config>::Call, usize)> {
 		maybe_known.map_or_else(|| {
 			Calls::<T>::get(hash).and_then(|(data, ..)| {
 				Decode::decode(&mut &data[..]).ok().map(|d| (d, data.len()))
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index ca15e04597eaa..6e88951843488 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -59,7 +59,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -89,7 +89,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = TestEvent;
@@ -114,7 +114,7 @@ impl Filter<Call> for TestBaseCallFilter {
 		}
 	}
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type Currency = Balances;
diff --git a/frame/multisig/src/weights.rs b/frame/multisig/src/weights.rs
index ab55b181f5a50..c0f6399e76420 100644
--- a/frame/multisig/src/weights.rs
+++ b/frame/multisig/src/weights.rs
@@ -58,7 +58,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_multisig using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn as_multi_threshold_1(z: u32, ) -> Weight {
 		(14_183_000 as Weight)
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index ddeadfb7680fe..e665802504262 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Nicks Module
 //!
-//! - [`nicks::Trait`](./trait.Trait.html)
+//! - [`nicks::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -37,7 +37,7 @@
 //! * `kill_name` - Forcibly remove the associated name; the deposit is lost.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -51,12 +51,12 @@ use frame_support::{
 };
 use frame_system::ensure_signed;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The currency trait.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -78,14 +78,14 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Nicks {
+	trait Store for Module<T: Config> as Nicks {
 		/// The lookup table for names.
 		NameOf: map hasher(twox_64_concat) T::AccountId => Option<(Vec<u8>, BalanceOf<T>)>;
 	}
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
 		/// A name was set. \[who\]
 		NameSet(AccountId),
 		/// A name was forcibly set. \[target\]
@@ -101,7 +101,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the nicks module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// A name is too short.
 		TooShort,
 		/// A name is too long.
@@ -113,7 +113,7 @@ decl_error! {
 
 decl_module! {
 	/// Nicks module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -262,7 +262,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -292,7 +292,7 @@ mod tests {
 	parameter_types! {
 		pub const ExistentialDeposit: u64 = 1;
 	}
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type MaxLocks = ();
 		type Balance = u64;
 		type Event = ();
@@ -309,7 +309,7 @@ mod tests {
 	ord_parameter_types! {
 		pub const One: u64 = 1;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Currency = Balances;
 		type ReservationFee = ReservationFee;
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 91f89ad1d9100..df6b391cc7a65 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -76,9 +76,9 @@ impl WeightInfo for () {
 	fn remove_connections() -> Weight { 50_000_000 }
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The event type of this module.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The maximum number of well known nodes that are allowed to set
 	type MaxWellKnownNodes: Get<u32>;
@@ -103,7 +103,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as NodeAuthorization {
+	trait Store for Module<T: Config> as NodeAuthorization {
 		/// The set of well known nodes. This is stored sorted (just by value).
 		pub WellKnownNodes get(fn well_known_nodes): BTreeSet<PeerId>;
 		/// A map that maintains the ownership of each node.
@@ -123,7 +123,7 @@ decl_storage! {
 
 decl_event! {
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// The given well known node was added.
 		NodeAdded(PeerId, AccountId),
@@ -149,7 +149,7 @@ decl_event! {
 
 decl_error! {
 	/// Error for the node authorization module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The PeerId is too long.
 		PeerIdTooLong,
 		/// Too many well known nodes.
@@ -170,7 +170,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The maximum number of authorized well known nodes
 		const MaxWellKnownNodes: u32 = T::MaxWellKnownNodes::get();
 
@@ -403,7 +403,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn initialize_nodes(nodes: &Vec<(PeerId, T::AccountId)>) {
 		let peer_ids = nodes.iter()
 			.map(|item| item.0.clone())
@@ -453,7 +453,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -491,7 +491,7 @@ mod tests {
 		pub const MaxWellKnownNodes: u32 = 4;
 		pub const MaxPeerIdLength: u32 = 2;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type MaxWellKnownNodes = MaxWellKnownNodes;
 		type MaxPeerIdLength = MaxPeerIdLength;
diff --git a/frame/offences/benchmarking/src/lib.rs b/frame/offences/benchmarking/src/lib.rs
index 47055eab73d4a..cdac46acb4516 100644
--- a/frame/offences/benchmarking/src/lib.rs
+++ b/frame/offences/benchmarking/src/lib.rs
@@ -24,22 +24,22 @@ mod mock;
 use sp_std::prelude::*;
 use sp_std::vec;
 
-use frame_system::{RawOrigin, Module as System, Trait as SystemTrait};
+use frame_system::{RawOrigin, Module as System, Config as SystemTrait};
 use frame_benchmarking::{benchmarks, account};
 use frame_support::traits::{Currency, OnInitialize};
 
 use sp_runtime::{Perbill, traits::{Convert, StaticLookup, Saturating, UniqueSaturatedInto}};
 use sp_staking::offence::{ReportOffence, Offence, OffenceDetails};
 
-use pallet_balances::{Trait as BalancesTrait};
+use pallet_balances::{Config as BalancesTrait};
 use pallet_babe::BabeEquivocationOffence;
 use pallet_grandpa::{GrandpaEquivocationOffence, GrandpaTimeSlot};
-use pallet_im_online::{Trait as ImOnlineTrait, Module as ImOnline, UnresponsivenessOffence};
-use pallet_offences::{Trait as OffencesTrait, Module as Offences};
-use pallet_session::historical::{Trait as HistoricalTrait, IdentificationTuple};
-use pallet_session::{Trait as SessionTrait, SessionManager};
+use pallet_im_online::{Config as ImOnlineTrait, Module as ImOnline, UnresponsivenessOffence};
+use pallet_offences::{Config as OffencesTrait, Module as Offences};
+use pallet_session::historical::{Config as HistoricalTrait, IdentificationTuple};
+use pallet_session::{Config as SessionTrait, SessionManager};
 use pallet_staking::{
-	Module as Staking, Trait as StakingTrait, RewardDestination, ValidatorPrefs,
+	Module as Staking, Config as StakingTrait, RewardDestination, ValidatorPrefs,
 	Exposure, IndividualExposure, ElectionStatus, MAX_NOMINATIONS, Event as StakingEvent
 };
 
@@ -50,9 +50,9 @@ const MAX_OFFENDERS: u32 = 100;
 const MAX_NOMINATORS: u32 = 100;
 const MAX_DEFERRED_OFFENCES: u32 = 100;
 
-pub struct Module<T: Trait>(Offences<T>);
+pub struct Module<T: Config>(Offences<T>);
 
-pub trait Trait:
+pub trait Config:
 	SessionTrait
 	+ StakingTrait
 	+ OffencesTrait
@@ -80,17 +80,17 @@ impl<T: HistoricalTrait + OffencesTrait> IdTupleConvert<T> for T where
 type LookupSourceOf<T> = <<T as SystemTrait>::Lookup as StaticLookup>::Source;
 type BalanceOf<T> = <<T as StakingTrait>::Currency as Currency<<T as SystemTrait>::AccountId>>::Balance;
 
-struct Offender<T: Trait> {
+struct Offender<T: Config> {
 	pub controller: T::AccountId,
 	pub stash: T::AccountId,
 	pub nominator_stashes: Vec<T::AccountId>,
 }
 
-fn bond_amount<T: Trait>() -> BalanceOf<T> {
+fn bond_amount<T: Config>() -> BalanceOf<T> {
 	T::Currency::minimum_balance().saturating_mul(10_000u32.into())
 }
 
-fn create_offender<T: Trait>(n: u32, nominators: u32) -> Result<Offender<T>, &'static str> {
+fn create_offender<T: Config>(n: u32, nominators: u32) -> Result<Offender<T>, &'static str> {
 	let stash: T::AccountId = account("stash", n, SEED);
 	let controller: T::AccountId = account("controller", n, SEED);
 	let controller_lookup: LookupSourceOf<T> = T::Lookup::unlookup(controller.clone());
@@ -149,7 +149,7 @@ fn create_offender<T: Trait>(n: u32, nominators: u32) -> Result<Offender<T>, &'s
 	Ok(Offender { controller, stash, nominator_stashes })
 }
 
-fn make_offenders<T: Trait>(num_offenders: u32, num_nominators: u32) -> Result<
+fn make_offenders<T: Config>(num_offenders: u32, num_nominators: u32) -> Result<
 	(Vec<IdentificationTuple<T>>, Vec<Offender<T>>),
 	&'static str
 > {
@@ -176,7 +176,7 @@ fn make_offenders<T: Trait>(num_offenders: u32, num_nominators: u32) -> Result<
 }
 
 #[cfg(test)]
-fn check_events<T: Trait, I: Iterator<Item = <T as SystemTrait>::Event>>(expected: I) {
+fn check_events<T: Config, I: Iterator<Item = <T as SystemTrait>::Event>>(expected: I) {
 	let events = System::<T>::events() .into_iter()
 		.map(|frame_system::EventRecord { event, .. }| event).collect::<Vec<_>>();
 	let expected = expected.collect::<Vec<_>>();
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 527e0ede81ab9..269324033bbc3 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -40,7 +40,7 @@ parameter_types! {
 	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -70,7 +70,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = Event;
@@ -83,13 +83,13 @@ impl pallet_balances::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
@@ -120,7 +120,7 @@ parameter_types! {
 	pub const Offset: u64 = 0;
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -149,7 +149,7 @@ parameter_types! {
 
 pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -174,7 +174,7 @@ impl pallet_staking::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_im_online::Trait for Test {
+impl pallet_im_online::Config for Test {
 	type AuthorityId = UintAuthorityId;
 	type Event = Event;
 	type SessionDuration = Period;
@@ -187,7 +187,7 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl pallet_offences::Trait for Test {
+impl pallet_offences::Config for Test {
 	type Event = Event;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
@@ -199,7 +199,7 @@ impl<T> frame_system::offchain::SendTransactionTypes<T> for Test where Call: Fro
 	type OverarchingCall = Call;
 }
 
-impl crate::Trait for Test {}
+impl crate::Config for Test {}
 
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Call, u64, ()>;
diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs
index e72498273cec0..e3f01823c18fc 100644
--- a/frame/offences/src/lib.rs
+++ b/frame/offences/src/lib.rs
@@ -42,11 +42,11 @@ use codec::{Encode, Decode};
 type OpaqueTimeSlot = Vec<u8>;
 
 /// A type alias for a report identifier.
-type ReportIdOf<T> = <T as frame_system::Trait>::Hash;
+type ReportIdOf<T> = <T as frame_system::Config>::Hash;
 
 /// Type of data stored as a deferred offence
 pub type DeferredOffenceOf<T> = (
-	Vec<OffenceDetails<<T as frame_system::Trait>::AccountId, <T as Trait>::IdentificationTuple>>,
+	Vec<OffenceDetails<<T as frame_system::Config>::AccountId, <T as Config>::IdentificationTuple>>,
 	Vec<Perbill>,
 	SessionIndex,
 );
@@ -66,9 +66,9 @@ impl WeightInfo for () {
 }
 
 /// Offences trait
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 	/// Full identification of the validator.
 	type IdentificationTuple: Parameter + Ord;
 	/// A handler called for every offence report.
@@ -80,7 +80,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Offences {
+	trait Store for Module<T: Config> as Offences {
 		/// The primary structure that holds all offence records keyed by report identifiers.
 		Reports get(fn reports):
 			map hasher(twox_64_concat) ReportIdOf<T>
@@ -116,7 +116,7 @@ decl_event!(
 );
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn deposit_event() = default;
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {
@@ -158,7 +158,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait, O: Offence<T::IdentificationTuple>>
+impl<T: Config, O: Offence<T::IdentificationTuple>>
 	ReportOffence<T::AccountId, T::IdentificationTuple, O> for Module<T>
 where
 	T::IdentificationTuple: Clone,
@@ -210,7 +210,7 @@ where
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Tries (without checking) to report an offence. Stores them in [`DeferredOffences`] in case
 	/// it fails. Returns false in case it has to store the offence.
 	fn report_or_store_offence(
@@ -293,7 +293,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-struct TriageOutcome<T: Trait> {
+struct TriageOutcome<T: Config> {
 	/// Other reports for the same report kinds.
 	concurrent_offenders: Vec<OffenceDetails<T::AccountId, T::IdentificationTuple>>,
 }
@@ -304,13 +304,13 @@ struct TriageOutcome<T: Trait> {
 /// This struct is responsible for aggregating storage writes and the underlying storage should not
 /// accessed directly meanwhile.
 #[must_use = "The changes are not saved without called `save`"]
-struct ReportIndexStorage<T: Trait, O: Offence<T::IdentificationTuple>> {
+struct ReportIndexStorage<T: Config, O: Offence<T::IdentificationTuple>> {
 	opaque_time_slot: OpaqueTimeSlot,
 	concurrent_reports: Vec<ReportIdOf<T>>,
 	same_kind_reports: Vec<(O::TimeSlot, ReportIdOf<T>)>,
 }
 
-impl<T: Trait, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
+impl<T: Config, O: Offence<T::IdentificationTuple>> ReportIndexStorage<T, O> {
 	/// Preload indexes from the storage for the specific `time_slot` and the kind of the offence.
 	fn load(time_slot: &O::TimeSlot) -> Self {
 		let opaque_time_slot = time_slot.encode();
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 58ee97a9bcbb5..690db58a87184 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -20,7 +20,7 @@
 #![cfg(test)]
 
 use std::cell::RefCell;
-use crate::{Module, Trait};
+use crate::{Module, Config};
 use codec::Encode;
 use sp_runtime::Perbill;
 use sp_staking::{
@@ -95,7 +95,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -127,7 +127,7 @@ parameter_types! {
 	pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get();
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type IdentificationTuple = u64;
 	type OnOffenceHandler = OnOffenceHandler;
diff --git a/frame/offences/src/tests.rs b/frame/offences/src/tests.rs
index ca9f46a198820..18582ec042ca8 100644
--- a/frame/offences/src/tests.rs
+++ b/frame/offences/src/tests.rs
@@ -342,7 +342,7 @@ fn weight_soft_limit_is_used() {
 	new_test_ext().execute_with(|| {
 		set_can_report(false);
 		// Only 2 can fit in one block
-		set_offence_weight(<mock::Runtime as Trait>::WeightSoftLimit::get() / 2);
+		set_offence_weight(<mock::Runtime as Config>::WeightSoftLimit::get() / 2);
 
 		// Queue 3 offences
 		// #1
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 5f1d79741dd8e..ac0fa52c97070 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -27,15 +27,15 @@ use crate::Module as Proxy;
 
 const SEED: u32 = 0;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = frame_system::Module::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
 }
 
-fn add_proxies<T: Trait>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(), &'static str> {
+fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(), &'static str> {
 	let caller = maybe_who.unwrap_or_else(|| whitelisted_caller());
 	T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 	for i in 0..n {
@@ -49,7 +49,7 @@ fn add_proxies<T: Trait>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(),
 	Ok(())
 }
 
-fn add_announcements<T: Trait>(
+fn add_announcements<T: Config>(
 	n: u32,
 	maybe_who: Option<T::AccountId>,
 	maybe_real: Option<T::AccountId>
@@ -91,7 +91,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 	}: _(RawOrigin::Signed(caller), real, Some(T::ProxyType::default()), Box::new(call))
 	verify {
 		assert_last_event::<T>(RawEvent::ProxyExecuted(Ok(())).into())
@@ -106,7 +106,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&delegate, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(delegate.clone()).into(),
 			real.clone(),
@@ -126,7 +126,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(caller.clone()).into(),
 			real.clone(),
@@ -147,7 +147,7 @@ benchmarks! {
 		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		Proxy::<T>::announce(
 			RawOrigin::Signed(caller.clone()).into(),
 			real.clone(),
@@ -169,7 +169,7 @@ benchmarks! {
 		// ... and "real" is the traditional caller. This is not a typo.
 		let real: T::AccountId = whitelisted_caller();
 		add_announcements::<T>(a, Some(caller.clone()), None)?;
-		let call: <T as Trait>::Call = frame_system::Call::<T>::remark(vec![]).into();
+		let call: <T as Config>::Call = frame_system::Call::<T>::remark(vec![]).into();
 		let call_hash = T::CallHasher::hash_of(&call);
 	}: _(RawOrigin::Signed(caller.clone()), real.clone(), call_hash)
 	verify {
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 75ab3902dc8db..3d707d2383672 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -23,7 +23,7 @@
 //! wish to execute some duration prior to execution happens. In this case, the target account may
 //! reject the announcement and in doing so, veto the execution.
 //!
-//! - [`proxy::Trait`](./trait.Trait.html)
+//! - [`proxy::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -33,7 +33,7 @@
 //! ### Dispatchable Functions
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -55,17 +55,17 @@ use frame_system::{self as system, ensure_signed};
 use frame_support::dispatch::DispatchError;
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
 		+ GetDispatchInfo + From<frame_system::Call<Self>> + IsSubType<Call<Self>>
-		+ IsType<<Self as frame_system::Trait>::Call>;
+		+ IsType<<Self as frame_system::Config>::Call>;
 
 	/// The currency mechanism.
 	type Currency: ReservableCurrency<Self::AccountId>;
@@ -74,7 +74,7 @@ pub trait Trait: frame_system::Trait {
 	/// The instance filter determines whether a given call may be proxied under this type.
 	///
 	/// IMPORTANT: `Default` must be provided and MUST BE the the *most permissive* value.
-	type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Trait>::Call>
+	type ProxyType: Parameter + Member + Ord + PartialOrd + InstanceFilter<<Self as Config>::Call>
 		+ Default;
 
 	/// The base amount of currency needed to reserve for creating a proxy.
@@ -137,10 +137,10 @@ pub struct Announcement<AccountId, Hash, BlockNumber> {
 	height: BlockNumber,
 }
 
-type CallHashOf<T> = <<T as Trait>::CallHasher as Hash>::Output;
+type CallHashOf<T> = <<T as Config>::CallHasher as Hash>::Output;
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Proxy {
+	trait Store for Module<T: Config> as Proxy {
 		/// The set of account proxies. Maps the account which has delegated to the accounts
 		/// which are being delegated to, together with the amount held on deposit.
 		pub Proxies get(fn proxies): map hasher(twox_64_concat) T::AccountId
@@ -153,7 +153,7 @@ decl_storage! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// There are too many proxies registered or too many announcements pending.
 		TooMany,
 		/// Proxy registration not found.
@@ -174,8 +174,8 @@ decl_error! {
 decl_event! {
 	/// Events type.
 	pub enum Event<T> where
-		AccountId = <T as frame_system::Trait>::AccountId,
-		ProxyType = <T as Trait>::ProxyType,
+		AccountId = <T as frame_system::Config>::AccountId,
+		ProxyType = <T as Config>::ProxyType,
 		Hash = CallHashOf<T>,
 	{
 		/// A proxy was executed correctly, with the given \[result\].
@@ -189,7 +189,7 @@ decl_event! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// Deposit one of this module's events by using the default implementation.
@@ -239,7 +239,7 @@ decl_module! {
 		fn proxy(origin,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			let who = ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &who, force_proxy_type)?;
@@ -509,7 +509,7 @@ decl_module! {
 			delegate: T::AccountId,
 			real: T::AccountId,
 			force_proxy_type: Option<T::ProxyType>,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			ensure_signed(origin)?;
 			let def = Self::find_proxy(&real, &delegate, force_proxy_type)?;
@@ -525,7 +525,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 
 	/// Calculate the address of an anonymous account.
 	///
@@ -680,12 +680,12 @@ impl<T: Trait> Module<T> {
 	fn do_proxy(
 		def: ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>,
 		real: T::AccountId,
-		call: <T as Trait>::Call,
+		call: <T as Config>::Call,
 	) {
 		// This is a freshly authenticated new account, the origin restrictions doesn't apply.
 		let mut origin: T::Origin = frame_system::RawOrigin::Signed(real).into();
-		origin.add_filter(move |c: &<T as frame_system::Trait>::Call| {
-			let c = <T as Trait>::Call::from_ref(c);
+		origin.add_filter(move |c: &<T as frame_system::Config>::Call| {
+			let c = <T as Config>::Call::from_ref(c);
 			// We make sure the proxy call does access this pallet to change modify proxies.
 			match c.is_sub_type() {
 				// Proxy call cannot add or remove a proxy with more permissions than it already has.
@@ -714,7 +714,7 @@ pub mod migration {
 	/// `ProxyDefinition` which additionally included a `BlockNumber` delay value. This function,
 	/// simply takes any existing proxies using the old tuple format, and migrates it to the new
 	/// struct by setting the delay to zero.
-	pub fn migrate_to_time_delayed_proxies<T: Trait>() -> Weight {
+	pub fn migrate_to_time_delayed_proxies<T: Config>() -> Weight {
 		Proxies::<T>::translate::<(Vec<(T::AccountId, T::ProxyType)>, BalanceOf<T>), _>(
 			|_, (targets, deposit)| Some((
 				targets.into_iter()
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index bcf3b678ed644..0338b983595aa 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -61,7 +61,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -91,7 +91,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = TestEvent;
@@ -100,7 +100,7 @@ impl pallet_balances::Trait for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 }
-impl pallet_utility::Trait for Test {
+impl pallet_utility::Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type WeightInfo = ();
@@ -143,7 +143,7 @@ impl Filter<Call> for BaseFilter {
 		}
 	}
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type Currency = Balances;
diff --git a/frame/proxy/src/weights.rs b/frame/proxy/src/weights.rs
index 944fe53a149c9..8f5a608aa5854 100644
--- a/frame/proxy/src/weights.rs
+++ b/frame/proxy/src/weights.rs
@@ -58,7 +58,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_proxy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn proxy(p: u32, ) -> Weight {
 		(32_194_000 as Weight)
 			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
diff --git a/frame/randomness-collective-flip/src/lib.rs b/frame/randomness-collective-flip/src/lib.rs
index c1747669dab07..ffa4da978a83e 100644
--- a/frame/randomness-collective-flip/src/lib.rs
+++ b/frame/randomness-collective-flip/src/lib.rs
@@ -39,10 +39,10 @@
 //! ```
 //! use frame_support::{decl_module, dispatch, traits::Randomness};
 //!
-//! pub trait Trait: frame_system::Trait {}
+//! pub trait Config: frame_system::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn random_module_example(origin) -> dispatch::DispatchResult {
 //! 			let _random_value = <pallet_randomness_collective_flip::Module<T>>::random(&b"my context"[..]);
@@ -63,18 +63,18 @@ use frame_support::{
 };
 use safe_mix::TripletMix;
 use codec::Encode;
-use frame_system::Trait;
+use frame_system::Config;
 
 const RANDOM_MATERIAL_LEN: u32 = 81;
 
-fn block_number_to_index<T: Trait>(block_number: T::BlockNumber) -> usize {
+fn block_number_to_index<T: Config>(block_number: T::BlockNumber) -> usize {
 	// on_initialize is called on the first block after genesis
 	let index = (block_number - 1u32.into()) % RANDOM_MATERIAL_LEN.into();
 	index.try_into().ok().expect("Something % 81 is always smaller than usize; qed")
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		fn on_initialize(block_number: T::BlockNumber) -> Weight {
 			let parent_hash = <frame_system::Module<T>>::parent_hash();
 
@@ -91,7 +91,7 @@ decl_module! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as RandomnessCollectiveFlip {
+	trait Store for Module<T: Config> as RandomnessCollectiveFlip {
 		/// Series of block headers from the last 81 blocks that acts as random seed material. This
 		/// is arranged as a ring buffer with `block_number % 81` being the index into the `Vec` of
 		/// the oldest hash.
@@ -99,7 +99,7 @@ decl_storage! {
 	}
 }
 
-impl<T: Trait> Randomness<T::Hash> for Module<T> {
+impl<T: Config> Randomness<T::Hash> for Module<T> {
 	/// This randomness uses a low-influence function, drawing upon the block hashes from the
 	/// previous 81 blocks. Its result for any given subject will be known far in advance by anyone
 	/// observing the chain. Any block producer has significant influence over their block hashes
@@ -157,7 +157,7 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index c97824497fded..023a805a719bf 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Recovery Pallet
 //!
-//! - [`recovery::Trait`](./trait.Trait.html)
+//! - [`recovery::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -172,12 +172,12 @@ mod mock;
 mod tests;
 
 type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo> + GetDispatchInfo;
@@ -237,7 +237,7 @@ pub struct RecoveryConfig<BlockNumber, Balance, AccountId> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Recovery {
+	trait Store for Module<T: Config> as Recovery {
 		/// The set of recoverable accounts and their recovery configuration.
 		pub Recoverable get(fn recovery_config):
 			map hasher(twox_64_concat) T::AccountId
@@ -262,7 +262,7 @@ decl_storage! {
 decl_event! {
 	/// Events type.
 	pub enum Event<T> where
-		AccountId = <T as system::Trait>::AccountId,
+		AccountId = <T as system::Config>::AccountId,
 	{
 		/// A recovery process has been set up for an \[account\].
 		RecoveryCreated(AccountId),
@@ -284,7 +284,7 @@ decl_event! {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// User is not allowed to make a call on behalf of this account
 		NotAllowed,
 		/// Threshold must be greater than zero
@@ -321,7 +321,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// The base amount of currency needed to reserve for creating a recovery configuration.
@@ -361,7 +361,7 @@ decl_module! {
 		)]
 		fn as_recovered(origin,
 			account: T::AccountId,
-			call: Box<<T as Trait>::Call>
+			call: Box<<T as Config>::Call>
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check `who` is allowed to make a call on behalf of `account`
@@ -677,7 +677,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Check that friends list is sorted and has no duplicates.
 	fn is_sorted_and_unique(friends: &Vec<T::AccountId>) -> bool {
 		friends.windows(2).all(|w| w[0] < w[1])
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 35373562487f7..9f15f31bd42f5 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -90,7 +90,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u128;
 	type DustRemoval = ();
@@ -107,7 +107,7 @@ parameter_types! {
 	pub const RecoveryDeposit: u64 = 10;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type Currency = Balances;
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index 753e9244628ad..6a67efc9d2dca 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -31,7 +31,7 @@ use frame_system::Module as System;
 const BLOCK_NUMBER: u32 = 2;
 
 // Add `n` named items to the schedule
-fn fill_schedule<T: Trait> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
+fn fill_schedule<T: Config> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
 	// Essentially a no-op call.
 	let call = frame_system::Call::set_storage(vec![]);
 	for i in 0..n {
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index c467678a466de..4cdfe4ddf047c 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Scheduler
 //! A module for scheduling dispatches.
 //!
-//! - [`scheduler::Trait`](./trait.Trait.html)
+//! - [`scheduler::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -29,7 +29,7 @@
 //! may be named or anonymous and may be canceled.
 //!
 //! **NOTE:** The scheduled calls will be dispatched with the default filter
-//! for the origin: namely `frame_system::Trait::BaseCallFilter` for all origin
+//! for the origin: namely `frame_system::Config::BaseCallFilter` for all origin
 //! except root which will get no filter. And not the filter contained in origin
 //! use to call `fn schedule`.
 //!
@@ -70,27 +70,27 @@ pub use weights::WeightInfo;
 /// pallet is dependent on specific other pallets, then their configuration traits
 /// should be added to our implied traits list.
 ///
-/// `system::Trait` should always be included in our implied traits.
-pub trait Trait: system::Trait {
+/// `system::Config` should always be included in our implied traits.
+pub trait Config: system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;
 
 	/// The aggregated origin which the dispatch will take.
 	type Origin: OriginTrait<PalletsOrigin =
-		Self::PalletsOrigin> + From<Self::PalletsOrigin> + IsType<<Self as system::Trait>::Origin>;
+		Self::PalletsOrigin> + From<Self::PalletsOrigin> + IsType<<Self as system::Config>::Origin>;
 
 	/// The caller origin, overarching type of all pallets origins.
 	type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq;
 
 	/// The aggregated call type.
-	type Call: Parameter + Dispatchable<Origin=<Self as Trait>::Origin> + GetDispatchInfo + From<system::Call<Self>>;
+	type Call: Parameter + Dispatchable<Origin=<Self as Config>::Origin> + GetDispatchInfo + From<system::Call<Self>>;
 
 	/// The maximum weight that may be scheduled per block for any dispatchables of less priority
 	/// than `schedule::HARD_DEADLINE`.
 	type MaximumWeight: Get<Weight>;
 
 	/// Required origin to schedule or cancel calls.
-	type ScheduleOrigin: EnsureOrigin<<Self as system::Trait>::Origin>;
+	type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;
 
 	/// The maximum number of scheduled calls in the queue for a single block.
 	/// Not strictly enforced, but used for weight estimation.
@@ -150,10 +150,10 @@ impl Default for Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Scheduler {
+	trait Store for Module<T: Config> as Scheduler {
 		/// Items to be executed, indexed by the block number that they should be executed on.
 		pub Agenda: map hasher(twox_64_concat) T::BlockNumber
-			=> Vec<Option<Scheduled<<T as Trait>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>;
+			=> Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, T::PalletsOrigin, T::AccountId>>>;
 
 		/// Lookup from identity to the block number and index of the task.
 		Lookup: map hasher(twox_64_concat) Vec<u8> => Option<TaskAddress<T::BlockNumber>>;
@@ -166,7 +166,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where <T as system::Trait>::BlockNumber {
+	pub enum Event<T> where <T as system::Config>::BlockNumber {
 		/// Scheduled some task. \[when, index\]
 		Scheduled(BlockNumber, u32),
 		/// Canceled some task. \[when, index\]
@@ -177,7 +177,7 @@ decl_event!(
 );
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Failed to schedule a call
 		FailedToSchedule,
 		/// Cannot find the scheduled call.
@@ -191,7 +191,7 @@ decl_error! {
 
 decl_module! {
 	/// Scheduler module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin {
+	pub struct Module<T: Config> for enum Call where origin: <T as system::Config>::Origin {
 		type Error = Error<T>;
 		fn deposit_event() = default;
 
@@ -210,10 +210,10 @@ decl_module! {
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule(DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call)?;
 		}
 
@@ -230,7 +230,7 @@ decl_module! {
 		#[weight = T::WeightInfo::cancel(T::MaxScheduledPerBlock::get())]
 		fn cancel(origin, when: T::BlockNumber, index: u32) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
 		}
 
@@ -250,10 +250,10 @@ decl_module! {
 			when: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule_named(
 				id, DispatchTime::At(when), maybe_periodic, priority, origin.caller().clone(), *call
 			)?;
@@ -272,7 +272,7 @@ decl_module! {
 		#[weight = T::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get())]
 		fn cancel_named(origin, id: Vec<u8>) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_cancel_named(Some(origin.caller().clone()), id)?;
 		}
 
@@ -286,10 +286,10 @@ decl_module! {
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule(
 				DispatchTime::After(after), maybe_periodic, priority, origin.caller().clone(), *call
 			)?;
@@ -306,10 +306,10 @@ decl_module! {
 			after: T::BlockNumber,
 			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 			priority: schedule::Priority,
-			call: Box<<T as Trait>::Call>,
+			call: Box<<T as Config>::Call>,
 		) {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
-			let origin = <T as Trait>::Origin::from(origin);
+			let origin = <T as Config>::Origin::from(origin);
 			Self::do_schedule_named(
 				id, DispatchTime::After(after), maybe_periodic, priority, origin.caller().clone(), *call
 			)?;
@@ -347,7 +347,7 @@ decl_module! {
 					*cumulative_weight = cumulative_weight
 						.saturating_add(s.call.get_dispatch_info().weight);
 
-					let origin = <<T as Trait>::Origin as From<T::PalletsOrigin>>::from(
+					let origin = <<T as Config>::Origin as From<T::PalletsOrigin>>::from(
 						s.origin.clone()
 					).into();
 
@@ -415,7 +415,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Migrate storage format from V1 to V2.
 	/// Return true if migration is performed.
 	pub fn migrate_v1_to_t2() -> bool {
@@ -423,7 +423,7 @@ impl<T: Trait> Module<T> {
 			StorageVersion::put(Releases::V2);
 
 			Agenda::<T>::translate::<
-				Vec<Option<ScheduledV1<<T as Trait>::Call, T::BlockNumber>>>, _
+				Vec<Option<ScheduledV1<<T as Config>::Call, T::BlockNumber>>>, _
 			>(|_, agenda| Some(
 				agenda
 					.into_iter()
@@ -447,7 +447,7 @@ impl<T: Trait> Module<T> {
 	/// Helper to migrate scheduler when the pallet origin type has changed.
 	pub fn migrate_origin<OldOrigin: Into<T::PalletsOrigin> + codec::Decode>() {
 		Agenda::<T>::translate::<
-			Vec<Option<Scheduled<<T as Trait>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>, _
+			Vec<Option<Scheduled<<T as Config>::Call, T::BlockNumber, OldOrigin, T::AccountId>>>, _
 		>(|_, agenda| Some(
 			agenda
 				.into_iter()
@@ -485,7 +485,7 @@ impl<T: Trait> Module<T> {
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call
+		call: <T as Config>::Call
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		let when = Self::resolve_time(when)?;
 
@@ -569,7 +569,7 @@ impl<T: Trait> Module<T> {
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call,
+		call: <T as Config>::Call,
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		// ensure id it is unique
 		if Lookup::<T>::contains_key(&id) {
@@ -657,7 +657,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule(
@@ -665,7 +665,7 @@ impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrig
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call
+		call: <T as Config>::Call
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_schedule(when, maybe_periodic, priority, origin, call)
 	}
@@ -686,7 +686,7 @@ impl<T: Trait> schedule::Anon<T::BlockNumber, <T as Trait>::Call, T::PalletsOrig
 	}
 }
 
-impl<T: Trait> schedule::Named<T::BlockNumber, <T as Trait>::Call, T::PalletsOrigin> for Module<T> {
+impl<T: Config> schedule::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin> for Module<T> {
 	type Address = TaskAddress<T::BlockNumber>;
 
 	fn schedule_named(
@@ -695,7 +695,7 @@ impl<T: Trait> schedule::Named<T::BlockNumber, <T as Trait>::Call, T::PalletsOri
 		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
-		call: <T as Trait>::Call,
+		call: <T as Config>::Call,
 	) -> Result<Self::Address, ()> {
 		Self::do_schedule_named(id, when, maybe_periodic, priority, origin, call).map_err(|_| ())
 	}
@@ -746,8 +746,8 @@ mod tests {
 		pub fn log() -> Vec<(OriginCaller, u32)> {
 			LOG.with(|log| log.borrow().clone())
 		}
-		pub trait Trait: system::Trait {
-			type Event: From<Event> + Into<<Self as system::Trait>::Event>;
+		pub trait Config: system::Config {
+			type Event: From<Event> + Into<<Self as system::Config>::Event>;
 		}
 		decl_event! {
 			pub enum Event {
@@ -755,10 +755,10 @@ mod tests {
 			}
 		}
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call
+			pub struct Module<T: Config> for enum Call
 			where
-				origin: <T as system::Trait>::Origin,
-				<T as system::Trait>::Origin: OriginTrait<PalletsOrigin = OriginCaller>
+				origin: <T as system::Config>::Origin,
+				<T as system::Config>::Origin: OriginTrait<PalletsOrigin = OriginCaller>
 			{
 				fn deposit_event() = default;
 
@@ -816,7 +816,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl system::Trait for Test {
+	impl system::Config for Test {
 		type BaseCallFilter = BaseFilter;
 		type Origin = Origin;
 		type Call = Call;
@@ -843,7 +843,7 @@ mod tests {
 		type OnKilledAccount = ();
 		type SystemWeightInfo = ();
 	}
-	impl logger::Trait for Test {
+	impl logger::Config for Test {
 		type Event = ();
 	}
 	parameter_types! {
@@ -854,7 +854,7 @@ mod tests {
 		pub const One: u64 = 1;
 	}
 
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Origin = Origin;
 		type PalletsOrigin = OriginCaller;
@@ -889,7 +889,7 @@ mod tests {
 	fn basic_scheduling_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call));
 			run_to_block(3);
 			assert!(logger::log().is_empty());
@@ -905,7 +905,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(3), None, 127, root(), call));
 			run_to_block(5);
@@ -922,7 +922,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			run_to_block(2);
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_ok!(Scheduler::do_schedule(DispatchTime::After(0), None, 127, root(), call));
 			// Will trigger on the next block.
 			run_to_block(3);
@@ -960,7 +960,7 @@ mod tests {
 	fn reschedule_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(), (4, 0));
 
 			run_to_block(3);
@@ -985,7 +985,7 @@ mod tests {
 	fn reschedule_named_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule_named(
 				1u32.encode(), DispatchTime::At(4), None, 127, root(), call
 			).unwrap(), (4, 0));
@@ -1012,7 +1012,7 @@ mod tests {
 	fn reschedule_named_perodic_works() {
 		new_test_ext().execute_with(|| {
 			let call = Call::Logger(logger::Call::log(42, 1000));
-			assert!(!<Test as frame_system::Trait>::BaseCallFilter::filter(&call));
+			assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(&call));
 			assert_eq!(Scheduler::do_schedule_named(
 				1u32.encode(), DispatchTime::At(4), Some((3, 3)), 127, root(), call
 			).unwrap(), (4, 0));
@@ -1203,10 +1203,10 @@ mod tests {
 	#[test]
 	fn on_initialize_weight_is_correct() {
 		new_test_ext().execute_with(|| {
-			let base_weight: Weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(1, 2);
+			let base_weight: Weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
 			let base_multiplier = 0;
-			let named_multiplier = <Test as frame_system::Trait>::DbWeight::get().writes(1);
-			let periodic_multiplier = <Test as frame_system::Trait>::DbWeight::get().reads_writes(1, 1);
+			let named_multiplier = <Test as frame_system::Config>::DbWeight::get().writes(1);
+			let periodic_multiplier = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
 
 			// Named
 			assert_ok!(
diff --git a/frame/scheduler/src/weights.rs b/frame/scheduler/src/weights.rs
index 3699e6f85b234..3c8be54c9ae54 100644
--- a/frame/scheduler/src/weights.rs
+++ b/frame/scheduler/src/weights.rs
@@ -52,7 +52,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_scheduler using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn schedule(s: u32, ) -> Weight {
 		(35_029_000 as Weight)
 			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index 90d4aca4e42a4..afcac229367b1 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -37,7 +37,7 @@
 //! from the `Pool` and `Members`; the entity is immediately replaced
 //! by the next highest scoring candidate in the pool, if available.
 //!
-//! - [`scored_pool::Trait`](./trait.Trait.html)
+//! - [`scored_pool::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -58,10 +58,10 @@
 //! use frame_system::ensure_signed;
 //! use pallet_scored_pool::{self as scored_pool};
 //!
-//! pub trait Trait: scored_pool::Trait {}
+//! pub trait Config: scored_pool::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn candidate(origin) -> dispatch::DispatchResult {
 //! 			let who = ensure_signed(origin)?;
@@ -103,8 +103,8 @@ use frame_support::{
 use frame_system::{ensure_root, ensure_signed};
 use sp_runtime::traits::{AtLeast32Bit, MaybeSerializeDeserialize, Zero, StaticLookup};
 
-type BalanceOf<T, I> = <<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type PoolT<T, I> = Vec<(<T as frame_system::Trait>::AccountId, Option<<T as Trait<I>>::Score>)>;
+type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type PoolT<T, I> = Vec<(<T as frame_system::Config>::AccountId, Option<<T as Config<I>>::Score>)>;
 
 /// The enum is supplied when refreshing the members set.
 /// Depending on the enum variant the corresponding associated
@@ -116,7 +116,7 @@ enum ChangeReceiver {
 	MembershipChanged,
 }
 
-pub trait Trait<I=DefaultInstance>: frame_system::Trait {
+pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The currency used for deposits.
 	type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
 
@@ -125,7 +125,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 		AtLeast32Bit + Clone + Copy + Default + FullCodec + MaybeSerializeDeserialize + Debug;
 
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	// The deposit which is reserved from candidates if they want to
 	// start a candidacy. The deposit gets returned when the candidacy is
@@ -156,7 +156,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as ScoredPool {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as ScoredPool {
 		/// The current pool of candidates, stored as an ordered Vec
 		/// (ordered descending by score, `None` last, highest first).
 		Pool get(fn pool) config(): PoolT<T, I>;
@@ -204,7 +204,7 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 	{
 		/// The given member was removed. See the transaction for who.
 		MemberRemoved,
@@ -225,7 +225,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the scored-pool module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Already a member.
 		AlreadyInPool,
 		/// Index out of bounds.
@@ -236,7 +236,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance>
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
 		for enum Call
 		where origin: T::Origin
 	{
@@ -275,7 +275,7 @@ decl_module! {
 
 			// can be inserted as last element in pool, since entities with
 			// `None` are always sorted to the end.
-			<Pool<T, I>>::append((who.clone(), Option::<<T as Trait<I>>::Score>::None));
+			<Pool<T, I>>::append((who.clone(), Option::<<T as Config<I>>::Score>::None));
 
 			<CandidateExists<T, I>>::insert(&who, true);
 
@@ -382,7 +382,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 
 	/// Fetches the `MemberCount` highest scoring members from
 	/// `Pool` and puts them into `Members`.
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 59c0dc66cca60..537084bb3949d 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -49,7 +49,7 @@ ord_parameter_types! {
 	pub const ScoreOrigin: u64 = 3;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -77,7 +77,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = ();
@@ -114,7 +114,7 @@ impl InitializeMembers<u64> for TestChangeMembers {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type KickOrigin = EnsureSignedBy<KickOrigin, u64>;
 	type MembershipInitialized = TestChangeMembers;
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 277200b269569..bd85b97c0d33e 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -41,10 +41,10 @@ use sp_runtime::traits::{One, StaticLookup};
 
 const MAX_VALIDATORS: u32 = 1000;
 
-pub struct Module<T: Trait>(pallet_session::Module<T>);
-pub trait Trait: pallet_session::Trait + pallet_session::historical::Trait + pallet_staking::Trait {}
+pub struct Module<T: Config>(pallet_session::Module<T>);
+pub trait Config: pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config {}
 
-impl<T: Trait> OnInitialize<T::BlockNumber> for Module<T> {
+impl<T: Config> OnInitialize<T::BlockNumber> for Module<T> {
 	fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
 		pallet_session::Module::<T>::on_initialize(n)
 	}
@@ -121,7 +121,7 @@ benchmarks! {
 /// Sets up the benchmark for checking a membership proof. It creates the given
 /// number of validators, sets random session keys and then creates a membership
 /// proof for the first authority and returns its key and the proof.
-fn check_membership_proof_setup<T: Trait>(
+fn check_membership_proof_setup<T: Config>(
 	n: u32,
 ) -> (
 	(sp_runtime::KeyTypeId, &'static [u8; 32]),
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 6a9cfc5f98a1b..af3112823d930 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -45,7 +45,7 @@ impl_outer_dispatch! {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -75,7 +75,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = ();
@@ -88,13 +88,13 @@ impl pallet_balances::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
@@ -120,7 +120,7 @@ impl pallet_session::SessionHandler<AccountId> for TestSessionHandler {
 	fn on_disabled(_: usize) {}
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<(), ()>;
@@ -157,7 +157,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
 	type Extrinsic = Extrinsic;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -182,7 +182,7 @@ impl pallet_staking::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl crate::Trait for Test {}
+impl crate::Config for Test {}
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs
index 20c3d57464c89..53f4dd7639b8c 100644
--- a/frame/session/src/historical/mod.rs
+++ b/frame/session/src/historical/mod.rs
@@ -41,8 +41,8 @@ mod shared;
 pub mod offchain;
 pub mod onchain;
 
-/// Trait necessary for the historical module.
-pub trait Trait: super::Trait {
+/// Config necessary for the historical module.
+pub trait Config: super::Config {
 	/// Full identification of the validator.
 	type FullIdentification: Parameter;
 
@@ -57,7 +57,7 @@ pub trait Trait: super::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Session {
+	trait Store for Module<T: Config> as Session {
 		/// Mapping from historical session indices to session-data root hash and validator count.
 		HistoricalSessions get(fn historical_root):
 			map hasher(twox_64_concat) SessionIndex => Option<(T::Hash, ValidatorCount)>;
@@ -71,10 +71,10 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Prune historical stored session roots up to (but not including)
 	/// `up_to`.
 	pub fn prune_up_to(up_to: SessionIndex) {
@@ -116,7 +116,7 @@ pub trait SessionManager<ValidatorId, FullIdentification>: crate::SessionManager
 /// sets the historical trie root of the ending session.
 pub struct NoteHistoricalRoot<T, I>(sp_std::marker::PhantomData<(T, I)>);
 
-impl<T: Trait, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T, I>
+impl<T: Config, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T, I>
 	where I: SessionManager<T::ValidatorId, T::FullIdentification>
 {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::ValidatorId>> {
@@ -160,15 +160,15 @@ impl<T: Trait, I> crate::SessionManager<T::ValidatorId> for NoteHistoricalRoot<T
 }
 
 /// A tuple of the validator's ID and their full identification.
-pub type IdentificationTuple<T> = (<T as crate::Trait>::ValidatorId, <T as Trait>::FullIdentification);
+pub type IdentificationTuple<T> = (<T as crate::Config>::ValidatorId, <T as Config>::FullIdentification);
 
 /// A trie instance for checking and generating proofs.
-pub struct ProvingTrie<T: Trait> {
+pub struct ProvingTrie<T: Config> {
 	db: MemoryDB<T::Hashing>,
 	root: T::Hash,
 }
 
-impl<T: Trait> ProvingTrie<T> {
+impl<T: Config> ProvingTrie<T> {
 	fn generate_for<I>(validators: I) -> Result<Self, &'static str>
 		where I: IntoIterator<Item=(T::ValidatorId, T::FullIdentification)>
 	{
@@ -260,7 +260,7 @@ impl<T: Trait> ProvingTrie<T> {
 	}
 }
 
-impl<T: Trait, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyTypeId, D)>
+impl<T: Config, D: AsRef<[u8]>> frame_support::traits::KeyOwnerProofSystem<(KeyTypeId, D)>
 	for Module<T>
 {
 	type Proof = MembershipProof;
diff --git a/frame/session/src/historical/offchain.rs b/frame/session/src/historical/offchain.rs
index 97655d1a18b32..616cdede254e4 100644
--- a/frame/session/src/historical/offchain.rs
+++ b/frame/session/src/historical/offchain.rs
@@ -29,18 +29,18 @@ use sp_runtime::{offchain::storage::StorageValueRef, KeyTypeId};
 use sp_session::MembershipProof;
 
 use super::super::{Module as SessionModule, SessionIndex};
-use super::{IdentificationTuple, ProvingTrie, Trait};
+use super::{IdentificationTuple, ProvingTrie, Config};
 
 use super::shared;
 use sp_std::prelude::*;
 
 
 /// A set of validators, which was used for a fixed session index.
-struct ValidatorSet<T: Trait> {
+struct ValidatorSet<T: Config> {
 	validator_set: Vec<IdentificationTuple<T>>,
 }
 
-impl<T: Trait> ValidatorSet<T> {
+impl<T: Config> ValidatorSet<T> {
 	/// Load the set of validators for a particular session index from the off-chain storage.
 	///
 	/// If none is found or decodable given `prefix` and `session`, it will return `None`.
@@ -61,7 +61,7 @@ impl<T: Trait> ValidatorSet<T> {
 
 /// Implement conversion into iterator for usage
 /// with [ProvingTrie](super::ProvingTrie::generate_for).
-impl<T: Trait> sp_std::iter::IntoIterator for ValidatorSet<T> {
+impl<T: Config> sp_std::iter::IntoIterator for ValidatorSet<T> {
 	type Item = (T::ValidatorId, T::FullIdentification);
 	type IntoIter = sp_std::vec::IntoIter<Self::Item>;
 	fn into_iter(self) -> Self::IntoIter {
@@ -74,7 +74,7 @@ impl<T: Trait> sp_std::iter::IntoIterator for ValidatorSet<T> {
 /// Based on the yielded `MembershipProof` the implementer may decide what
 /// to do, i.e. in case of a failed proof, enqueue a transaction back on
 /// chain reflecting that, with all its consequences such as i.e. slashing.
-pub fn prove_session_membership<T: Trait, D: AsRef<[u8]>>(
+pub fn prove_session_membership<T: Config, D: AsRef<[u8]>>(
 	session_index: SessionIndex,
 	session_key: (KeyTypeId, D),
 ) -> Option<MembershipProof> {
@@ -97,7 +97,7 @@ pub fn prove_session_membership<T: Trait, D: AsRef<[u8]>>(
 /// Due to re-organisation it could be that the `first_to_keep` might be less
 /// than the stored one, in which case the conservative choice is made to keep records
 /// up to the one that is the lesser.
-pub fn prune_older_than<T: Trait>(first_to_keep: SessionIndex) {
+pub fn prune_older_than<T: Config>(first_to_keep: SessionIndex) {
 	let derived_key = shared::LAST_PRUNE.to_vec();
 	let entry = StorageValueRef::persistent(derived_key.as_ref());
 	match entry.mutate(|current: Option<Option<SessionIndex>>| -> Result<_, ()> {
@@ -127,7 +127,7 @@ pub fn prune_older_than<T: Trait>(first_to_keep: SessionIndex) {
 }
 
 /// Keep the newest `n` items, and prune all items older than that.
-pub fn keep_newest<T: Trait>(n_to_keep: usize) {
+pub fn keep_newest<T: Config>(n_to_keep: usize) {
 	let session_index = <SessionModule<T>>::current_index();
 	let n_to_keep = n_to_keep as SessionIndex;
 	if n_to_keep < session_index {
@@ -189,8 +189,8 @@ mod tests {
 	#[test]
 	fn encode_decode_roundtrip() {
 		use codec::{Decode, Encode};
-		use super::super::super::Trait as SessionTrait;
-		use super::super::Trait as HistoricalTrait;
+		use super::super::super::Config as SessionTrait;
+		use super::super::Config as HistoricalTrait;
 
 		let sample = (
 				22u32 as <Test as SessionTrait>::ValidatorId,
diff --git a/frame/session/src/historical/onchain.rs b/frame/session/src/historical/onchain.rs
index 745603a49829b..dd6c9de9b58b5 100644
--- a/frame/session/src/historical/onchain.rs
+++ b/frame/session/src/historical/onchain.rs
@@ -20,9 +20,9 @@
 use codec::Encode;
 use sp_runtime::traits::Convert;
 
-use super::super::Trait as SessionTrait;
+use super::super::Config as SessionTrait;
 use super::super::{Module as SessionModule, SessionIndex};
-use super::Trait as HistoricalTrait;
+use super::Config as HistoricalTrait;
 
 use super::shared;
 use sp_std::prelude::*;
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index c0a8fc29165bd..40ae5bed83e49 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -20,7 +20,7 @@
 //! The Session module allows validators to manage their session keys, provides a function for changing
 //! the session length, and handles session rotation.
 //!
-//! - [`session::Trait`](./trait.Trait.html)
+//! - [`session::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -88,7 +88,7 @@
 //! ```
 //! use pallet_session as session;
 //!
-//! fn validators<T: pallet_session::Trait>() -> Vec<<T as pallet_session::Trait>::ValidatorId> {
+//! fn validators<T: pallet_session::Config>() -> Vec<<T as pallet_session::Config>::ValidatorId> {
 //!	<pallet_session::Module<T>>::validators()
 //! }
 //! # fn main(){}
@@ -346,15 +346,15 @@ impl<AId> SessionHandler<AId> for TestSessionHandler {
 	fn on_disabled(_: usize) {}
 }
 
-impl<T: Trait> ValidatorRegistration<T::ValidatorId> for Module<T> {
+impl<T: Config> ValidatorRegistration<T::ValidatorId> for Module<T> {
 	fn is_registered(id: &T::ValidatorId) -> bool {
 		Self::load_keys(id).is_some()
 	}
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// A stable ID for a validator.
 	type ValidatorId: Member + Parameter;
@@ -392,7 +392,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Session {
+	trait Store for Module<T: Config> as Session {
 		/// The current set of validators.
 		Validators get(fn validators): Vec<T::ValidatorId>;
 
@@ -483,7 +483,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the session module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Invalid ownership proof.
 		InvalidProof,
 		/// No associated validator ID for account.
@@ -496,7 +496,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -560,7 +560,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Move on to next session. Register new validator set and session keys. Changes
 	/// to the validator set have a session of delay to take effect. This allows for
 	/// equivocation punishment after a fork.
@@ -776,7 +776,7 @@ impl<T: Trait> Module<T> {
 /// registering account-ID of that session key index.
 pub struct FindAccountFromAuthorIndex<T, Inner>(sp_std::marker::PhantomData<(T, Inner)>);
 
-impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
+impl<T: Config, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 	for FindAccountFromAuthorIndex<T, Inner>
 {
 	fn find_author<'a, I>(digests: I) -> Option<T::ValidatorId>
@@ -789,7 +789,7 @@ impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 	}
 }
 
-impl<T: Trait> EstimateNextNewSession<T::BlockNumber> for Module<T> {
+impl<T: Config> EstimateNextNewSession<T::BlockNumber> for Module<T> {
 	/// This session module always calls new_session and next_session at the same time, hence we
 	/// do a simple proxy and pass the function to next rotation.
 	fn estimate_next_new_session(now: T::BlockNumber) -> Option<T::BlockNumber> {
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index 1d787ac53b438..d485565db237f 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -172,7 +172,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -200,7 +200,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -211,7 +211,7 @@ parameter_types! {
 	pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(33);
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type ShouldEndSession = TestShouldEndSession;
 	#[cfg(feature = "historical")]
 	type SessionManager = crate::historical::NoteHistoricalRoot<Test, TestSessionManager>;
@@ -228,7 +228,7 @@ impl Trait for Test {
 }
 
 #[cfg(feature = "historical")]
-impl crate::historical::Trait for Test {
+impl crate::historical::Config for Test {
 	type FullIdentification = u64;
 	type FullIdentificationOf = sp_runtime::traits::ConvertInto;
 }
diff --git a/frame/session/src/tests.rs b/frame/session/src/tests.rs
index 75def78046beb..36857824de8bf 100644
--- a/frame/session/src/tests.rs
+++ b/frame/session/src/tests.rs
@@ -285,7 +285,7 @@ fn session_keys_generate_output_works_as_set_keys_input() {
 		assert_ok!(
 			Session::set_keys(
 				Origin::signed(2),
-				<mock::Test as Trait>::Keys::decode(&mut &new_keys[..]).expect("Decode keys"),
+				<mock::Test as Config>::Keys::decode(&mut &new_keys[..]).expect("Decode keys"),
 				vec![],
 			)
 		);
diff --git a/frame/session/src/weights.rs b/frame/session/src/weights.rs
index f1fc18b0ef998..243ddc04b085f 100644
--- a/frame/session/src/weights.rs
+++ b/frame/session/src/weights.rs
@@ -50,7 +50,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_session using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_keys() -> Weight {
 		(86_033_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index cbfe5a00de240..7859f6659cf2d 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Society Module
 //!
-//! - [`society::Trait`](./trait.Trait.html)
+//! - [`society::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -268,13 +268,13 @@ use frame_support::traits::{
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
 
-type BalanceOf<T, I> = <<T as Trait<I>>::Currency as Currency<<T as system::Trait>::AccountId>>::Balance;
-type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+type BalanceOf<T, I> = <<T as Config<I>>::Currency as Currency<<T as system::Config>::AccountId>>::Balance;
+type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// The module's configuration trait.
-pub trait Trait<I=DefaultInstance>: system::Trait {
+pub trait Config<I=DefaultInstance>: system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 
 	/// The societies's module id
 	type ModuleId: Get<ModuleId>;
@@ -403,7 +403,7 @@ impl<AccountId: PartialEq, Balance> BidKind<AccountId, Balance> {
 
 // This module's storage items.
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Society {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Society {
 		/// The first member.
 		pub Founder get(fn founder) build(|config: &GenesisConfig<T, I>| config.members.first().cloned()):
 			Option<T::AccountId>;
@@ -472,7 +472,7 @@ decl_storage! {
 // The module's dispatchable functions.
 decl_module! {
 	/// The module declaration.
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where origin: T::Origin {
 		type Error = Error<T, I>;
 		/// The minimum amount of a deposit required for a bid to be made.
 		const CandidateDeposit: BalanceOf<T, I> = T::CandidateDeposit::get();
@@ -1065,7 +1065,7 @@ decl_module! {
 
 decl_error! {
 	/// Errors for this module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// An incorrect position was provided.
 		BadPosition,
 		/// User is not a member.
@@ -1108,7 +1108,7 @@ decl_error! {
 decl_event! {
 	/// Events for this module.
 	pub enum Event<T, I=DefaultInstance> where
-		AccountId = <T as system::Trait>::AccountId,
+		AccountId = <T as system::Config>::AccountId,
 		Balance = BalanceOf<T, I>
 	{
 		/// The society is founded by the given identity. \[founder\]
@@ -1151,7 +1151,7 @@ decl_event! {
 
 /// Simple ensure origin struct to filter for the founder account.
 pub struct EnsureFounder<T>(sp_std::marker::PhantomData<T>);
-impl<T: Trait> EnsureOrigin<T::Origin> for EnsureFounder<T> {
+impl<T: Config> EnsureOrigin<T::Origin> for EnsureFounder<T> {
 	type Success = T::AccountId;
 	fn try_origin(o: T::Origin) -> Result<Self::Success, T::Origin> {
 		o.into().and_then(|o| match (o, Founder::<T>::get()) {
@@ -1182,7 +1182,7 @@ fn pick_usize<'a, R: RngCore>(rng: &mut R, max: usize) -> usize {
 	(rng.next_u32() % (max as u32 + 1)) as usize
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	/// Puts a bid into storage ordered by smallest to largest value.
 	/// Allows a maximum of 1000 bids in queue, removing largest value people first.
 	fn put_bid(
@@ -1669,7 +1669,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait> OnUnbalanced<NegativeImbalanceOf<T>> for Module<T> {
+impl<T: Config> OnUnbalanced<NegativeImbalanceOf<T>> for Module<T> {
 	fn on_nonzero_unbalanced(amount: NegativeImbalanceOf<T>) {
 		let numeric_amount = amount.peek();
 
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index 212bcfd404ff1..d4fa1bcfbc743 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -60,7 +60,7 @@ ord_parameter_types! {
 	pub const SuspensionJudgementSetAccount: u128 = 2;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -88,7 +88,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = ();
@@ -98,7 +98,7 @@ impl pallet_balances::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type Currency = pallet_balances::Module<Self>;
 	type Randomness = TestRandomness;
diff --git a/frame/staking/fuzzer/src/mock.rs b/frame/staking/fuzzer/src/mock.rs
index 96df7674e9f44..ac9a2b235790e 100644
--- a/frame/staking/fuzzer/src/mock.rs
+++ b/frame/staking/fuzzer/src/mock.rs
@@ -43,7 +43,7 @@ impl_outer_dispatch! {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type DbWeight = ();
@@ -73,7 +73,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: Balance = 10;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = Balance;
 	type Event = ();
@@ -82,7 +82,7 @@ impl pallet_balances::Trait for Test {
 	type AccountStore = System;
 	type WeightInfo = ();
 }
-impl pallet_indices::Trait for Test {
+impl pallet_indices::Config for Test {
 	type AccountIndex = AccountIndex;
 	type Event = ();
 	type Currency = Balances;
@@ -92,13 +92,13 @@ impl pallet_indices::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
 	type WeightInfo = ();
 }
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Test>;
 }
@@ -124,7 +124,7 @@ impl pallet_session::SessionHandler<AccountId> for TestSessionHandler {
 	fn on_disabled(_: usize) {}
 }
 
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<(), ()>;
@@ -161,7 +161,7 @@ impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
 	type Extrinsic = Extrinsic;
 }
 
-impl pallet_staking::Trait for Test {
+impl pallet_staking::Config for Test {
 	type Currency = Balances;
 	type UnixTime = pallet_timestamp::Module<Self>;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index 94a97debe4ff3..f6aedf760d979 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -31,7 +31,7 @@ const MAX_SLASHES: u32 = 1000;
 
 // Add slashing spans to a user account. Not relevant for actual use, only to benchmark
 // read and write operations.
-fn add_slashing_spans<T: Trait>(who: &T::AccountId, spans: u32) {
+fn add_slashing_spans<T: Config>(who: &T::AccountId, spans: u32) {
 	if spans == 0 { return }
 
 	// For the first slashing span, we initialize
@@ -48,7 +48,7 @@ fn add_slashing_spans<T: Trait>(who: &T::AccountId, spans: u32) {
 // This function clears all existing validators and nominators from the set, and generates one new
 // validator being nominated by n nominators, and returns the validator stash account and the
 // nominators' stash and controller. It also starts an era and creates pending payouts.
-pub fn create_validator_with_nominators<T: Trait>(
+pub fn create_validator_with_nominators<T: Config>(
 	n: u32,
 	upper_bound: u32,
 	dead: bool,
@@ -729,7 +729,7 @@ mod tests {
 
 			let (validator_stash, nominators) = create_validator_with_nominators::<Test>(
 				n,
-				<Test as Trait>::MaxNominatorRewardedPerValidator::get() as u32,
+				<Test as Config>::MaxNominatorRewardedPerValidator::get() as u32,
 				false,
 				RewardDestination::Staked,
 			).unwrap();
@@ -753,7 +753,7 @@ mod tests {
 
 			let (validator_stash, _nominators) = create_validator_with_nominators::<Test>(
 				n,
-				<Test as Trait>::MaxNominatorRewardedPerValidator::get() as u32,
+				<Test as Config>::MaxNominatorRewardedPerValidator::get() as u32,
 				false,
 				RewardDestination::Staked,
 			).unwrap();
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
index e5aaae6bbb8f9..5f5f5ff2bb6e0 100644
--- a/frame/staking/src/lib.rs
+++ b/frame/staking/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! The Staking module is used to manage funds at stake by network maintainers.
 //!
-//! - [`staking::Trait`](./trait.Trait.html)
+//! - [`staking::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -107,7 +107,7 @@
 //!
 //! Rewards must be claimed for each era before it gets too old by `$HISTORY_DEPTH` using the
 //! `payout_stakers` call. Any account can call `payout_stakers`, which pays the reward to the
-//! validator as well as its nominators. Only the [`Trait::MaxNominatorRewardedPerValidator`]
+//! validator as well as its nominators. Only the [`Config::MaxNominatorRewardedPerValidator`]
 //! biggest stakers can claim their reward. This is to limit the i/o cost to mutate storage for each
 //! nominator's account.
 //!
@@ -154,10 +154,10 @@
 //! use frame_system::ensure_signed;
 //! use pallet_staking::{self as staking};
 //!
-//! pub trait Trait: staking::Trait {}
+//! pub trait Config: staking::Config {}
 //!
 //! decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         /// Reward a validator.
 //!         #[weight = 0]
 //!         pub fn reward_myself(origin) -> dispatch::DispatchResult {
@@ -175,7 +175,7 @@
 //! ### Era payout
 //!
 //! The era payout is computed using yearly inflation curve defined at
-//! [`T::RewardCurve`](./trait.Trait.html#associatedtype.RewardCurve) as such:
+//! [`T::RewardCurve`](./trait.Config.html#associatedtype.RewardCurve) as such:
 //!
 //! ```nocompile
 //! staker_payout = yearly_inflation(npos_token_staked / total_tokens) * total_tokens / era_per_year
@@ -186,7 +186,7 @@
 //! remaining_payout = max_yearly_inflation * total_tokens / era_per_year - staker_payout
 //! ```
 //! The remaining reward is send to the configurable end-point
-//! [`T::RewardRemainder`](./trait.Trait.html#associatedtype.RewardRemainder).
+//! [`T::RewardRemainder`](./trait.Config.html#associatedtype.RewardRemainder).
 //!
 //! ### Reward Calculation
 //!
@@ -232,7 +232,7 @@
 //!
 //! The controller account can free a portion (or all) of the funds using the
 //! [`unbond`](enum.Call.html#variant.unbond) call. Note that the funds are not immediately
-//! accessible. Instead, a duration denoted by [`BondingDuration`](./trait.Trait.html#associatedtype.BondingDuration)
+//! accessible. Instead, a duration denoted by [`BondingDuration`](./trait.Config.html#associatedtype.BondingDuration)
 //! (in number of eras) must pass until the funds can actually be removed. Once the
 //! `BondingDuration` is over, the [`withdraw_unbonded`](./enum.Call.html#variant.withdraw_unbonded)
 //! call can be used to actually withdraw the funds.
@@ -385,12 +385,12 @@ pub type OffchainAccuracy = PerU16;
 
 /// The balance type of this module.
 pub type BalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 type PositiveImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::PositiveImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
 type NegativeImbalanceOf<T> =
-	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// Information regarding the active era (era in used in session).
 #[derive(Encode, Decode, RuntimeDebug)]
@@ -732,8 +732,8 @@ impl<BlockNumber> Default for ElectionStatus<BlockNumber> {
 
 /// Means for interacting with a specialized version of the `session` trait.
 ///
-/// This is needed because `Staking` sets the `ValidatorIdOf` of the `pallet_session::Trait`
-pub trait SessionInterface<AccountId>: frame_system::Trait {
+/// This is needed because `Staking` sets the `ValidatorIdOf` of the `pallet_session::Config`
+pub trait SessionInterface<AccountId>: frame_system::Config {
 	/// Disable a given validator by stash ID.
 	///
 	/// Returns `true` if new era should be forced at the end of this session.
@@ -746,22 +746,22 @@ pub trait SessionInterface<AccountId>: frame_system::Trait {
 	fn prune_historical_up_to(up_to: SessionIndex);
 }
 
-impl<T: Trait> SessionInterface<<T as frame_system::Trait>::AccountId> for T where
-	T: pallet_session::Trait<ValidatorId = <T as frame_system::Trait>::AccountId>,
-	T: pallet_session::historical::Trait<
-		FullIdentification = Exposure<<T as frame_system::Trait>::AccountId, BalanceOf<T>>,
+impl<T: Config> SessionInterface<<T as frame_system::Config>::AccountId> for T where
+	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
+	T: pallet_session::historical::Config<
+		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
 		FullIdentificationOf = ExposureOf<T>,
 	>,
-	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Trait>::AccountId>,
-	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Trait>::AccountId>,
+	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
+	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
 	T::ValidatorIdOf:
-		Convert<<T as frame_system::Trait>::AccountId, Option<<T as frame_system::Trait>::AccountId>>,
+		Convert<<T as frame_system::Config>::AccountId, Option<<T as frame_system::Config>::AccountId>>,
 {
-	fn disable_validator(validator: &<T as frame_system::Trait>::AccountId) -> Result<bool, ()> {
+	fn disable_validator(validator: &<T as frame_system::Config>::AccountId) -> Result<bool, ()> {
 		<pallet_session::Module<T>>::disable(validator)
 	}
 
-	fn validators() -> Vec<<T as frame_system::Trait>::AccountId> {
+	fn validators() -> Vec<<T as frame_system::Config>::AccountId> {
 		<pallet_session::Module<T>>::validators()
 	}
 
@@ -770,7 +770,7 @@ impl<T: Trait> SessionInterface<<T as frame_system::Trait>::AccountId> for T whe
 	}
 }
 
-pub trait Trait: frame_system::Trait + SendTransactionTypes<Call<Self>> {
+pub trait Config: frame_system::Config + SendTransactionTypes<Call<Self>> {
 	/// The staking balance.
 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
 
@@ -792,7 +792,7 @@ pub trait Trait: frame_system::Trait + SendTransactionTypes<Call<Self>> {
 	type RewardRemainder: OnUnbalanced<NegativeImbalanceOf<Self>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Handler for the unbalanced reduction when slashing a staker.
 	type Slash: OnUnbalanced<NegativeImbalanceOf<Self>>;
@@ -904,7 +904,7 @@ impl Default for Releases {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Staking {
+	trait Store for Module<T: Config> as Staking {
 		/// Number of eras to keep in history.
 		///
 		/// Information is kept for eras in `[current_era - history_depth; current_era]`.
@@ -1121,7 +1121,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where Balance = BalanceOf<T>, <T as frame_system::Config>::AccountId {
 		/// The era payout has been set; the first balance is the validator-payout; the second is
 		/// the remainder from the maximum amount of reward.
 		/// \[era_index, validator_payout, remainder\]
@@ -1153,7 +1153,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the staking module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Not a controller account.
 		NotController,
 		/// Not a stash account.
@@ -1223,7 +1223,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// Number of sessions per era.
 		const SessionsPerEra: SessionIndex = T::SessionsPerEra::get();
 
@@ -2159,7 +2159,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// The total balance that can be slashed from a stash account as of right now.
 	pub fn slashable_balance_of(stash: &T::AccountId) -> BalanceOf<T> {
 		// Weight note: consider making the stake accessible through stash.
@@ -3083,7 +3083,7 @@ impl<T: Trait> Module<T> {
 ///
 /// Once the first new_session is planned, all session must start and then end in order, though
 /// some session can lag in between the newest session planned and the latest session started.
-impl<T: Trait> pallet_session::SessionManager<T::AccountId> for Module<T> {
+impl<T: Config> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	fn new_session(new_index: SessionIndex) -> Option<Vec<T::AccountId>> {
 		Self::new_session(new_index)
 	}
@@ -3095,7 +3095,7 @@ impl<T: Trait> pallet_session::SessionManager<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>> for Module<T> {
+impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId, BalanceOf<T>>> for Module<T> {
 	fn new_session(new_index: SessionIndex)
 		-> Option<Vec<(T::AccountId, Exposure<T::AccountId, BalanceOf<T>>)>>
 	{
@@ -3124,7 +3124,7 @@ impl<T: Trait> historical::SessionManager<T::AccountId, Exposure<T::AccountId, B
 /// * 1 point to the producer of each referenced uncle block.
 impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Module<T>
 	where
-		T: Trait + pallet_authorship::Trait + pallet_session::Trait
+		T: Config + pallet_authorship::Config + pallet_session::Config
 {
 	fn note_author(author: T::AccountId) {
 		Self::reward_by_ids(vec![(author, 20)])
@@ -3141,7 +3141,7 @@ impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Module
 /// if any.
 pub struct StashOf<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
+impl<T: Config> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
 	fn convert(controller: T::AccountId) -> Option<T::AccountId> {
 		<Module<T>>::ledger(&controller).map(|l| l.stash)
 	}
@@ -3154,7 +3154,7 @@ impl<T: Trait> Convert<T::AccountId, Option<T::AccountId>> for StashOf<T> {
 /// `active_era`. It can differ from the latest planned exposure in `current_era`.
 pub struct ExposureOf<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>>>
+impl<T: Config> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>>>
 	for ExposureOf<T>
 {
 	fn convert(validator: T::AccountId) -> Option<Exposure<T::AccountId, BalanceOf<T>>> {
@@ -3167,19 +3167,19 @@ impl<T: Trait> Convert<T::AccountId, Option<Exposure<T::AccountId, BalanceOf<T>>
 }
 
 /// This is intended to be used with `FilterHistoricalOffences`.
-impl <T: Trait>
+impl <T: Config>
 	OnOffenceHandler<T::AccountId, pallet_session::historical::IdentificationTuple<T>, Weight>
 for Module<T> where
-	T: pallet_session::Trait<ValidatorId = <T as frame_system::Trait>::AccountId>,
-	T: pallet_session::historical::Trait<
-		FullIdentification = Exposure<<T as frame_system::Trait>::AccountId, BalanceOf<T>>,
+	T: pallet_session::Config<ValidatorId = <T as frame_system::Config>::AccountId>,
+	T: pallet_session::historical::Config<
+		FullIdentification = Exposure<<T as frame_system::Config>::AccountId, BalanceOf<T>>,
 		FullIdentificationOf = ExposureOf<T>,
 	>,
-	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Trait>::AccountId>,
-	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Trait>::AccountId>,
+	T::SessionHandler: pallet_session::SessionHandler<<T as frame_system::Config>::AccountId>,
+	T::SessionManager: pallet_session::SessionManager<<T as frame_system::Config>::AccountId>,
 	T::ValidatorIdOf: Convert<
-		<T as frame_system::Trait>::AccountId,
-		Option<<T as frame_system::Trait>::AccountId>,
+		<T as frame_system::Config>::AccountId,
+		Option<<T as frame_system::Config>::AccountId>,
 	>,
 {
 	fn on_offence(
@@ -3310,7 +3310,7 @@ pub struct FilterHistoricalOffences<T, R> {
 
 impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
 	for FilterHistoricalOffences<Module<T>, R> where
-	T: Trait,
+	T: Config,
 	R: ReportOffence<Reporter, Offender, O>,
 	O: Offence<Offender>,
 {
@@ -3335,7 +3335,7 @@ impl<T, Reporter, Offender, R, O> ReportOffence<Reporter, Offender, O>
 }
 
 #[allow(deprecated)]
-impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::submit_election_solution_unsigned(
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index 3aa3e9ae03d74..4bc1921c494d4 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -141,7 +141,7 @@ parameter_types! {
 	pub static MaxIterations: u32 = 0;
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -168,7 +168,7 @@ impl frame_system::Trait for Test {
 	type OnKilledAccount = ();
 	type SystemWeightInfo = ();
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = MaxLocks;
 	type Balance = Balance;
 	type Event = MetaEvent;
@@ -187,7 +187,7 @@ sp_runtime::impl_opaque_keys! {
 		pub other: OtherSessionHandler,
 	}
 }
-impl pallet_session::Trait for Test {
+impl pallet_session::Config for Test {
 	type SessionManager = pallet_session::historical::NoteHistoricalRoot<Test, Staking>;
 	type Keys = SessionKeys;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
@@ -200,11 +200,11 @@ impl pallet_session::Trait for Test {
 	type WeightInfo = ();
 }
 
-impl pallet_session::historical::Trait for Test {
+impl pallet_session::historical::Config for Test {
 	type FullIdentification = crate::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = crate::ExposureOf<Test>;
 }
-impl pallet_authorship::Trait for Test {
+impl pallet_authorship::Config for Test {
 	type FindAuthor = Author11;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
@@ -213,7 +213,7 @@ impl pallet_authorship::Trait for Test {
 parameter_types! {
 	pub const MinimumPeriod: u64 = 5;
 }
-impl pallet_timestamp::Trait for Test {
+impl pallet_timestamp::Config for Test {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
@@ -253,7 +253,7 @@ impl OnUnbalanced<NegativeImbalanceOf<Test>> for RewardRemainderMock {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
@@ -659,7 +659,7 @@ pub(crate) fn start_era(era_index: EraIndex) {
 
 pub(crate) fn current_total_payout_for_duration(duration: u64) -> Balance {
 	inflation::compute_total_payout(
-		<Test as Trait>::RewardCurve::get(),
+		<Test as Config>::RewardCurve::get(),
 		Staking::eras_total_stake(Staking::active_era().unwrap().index),
 		Balances::total_issuance(),
 		duration,
@@ -667,7 +667,7 @@ pub(crate) fn current_total_payout_for_duration(duration: u64) -> Balance {
 }
 
 pub(crate) fn reward_all_elected() {
-	let rewards = <Test as Trait>::SessionInterface::validators()
+	let rewards = <Test as Config>::SessionInterface::validators()
 		.into_iter()
 		.map(|v| (v, 1));
 
diff --git a/frame/staking/src/offchain_election.rs b/frame/staking/src/offchain_election.rs
index cb4d460f68035..35d9fa7c1f850 100644
--- a/frame/staking/src/offchain_election.rs
+++ b/frame/staking/src/offchain_election.rs
@@ -19,7 +19,7 @@
 
 use crate::{
 	Call, CompactAssignments, ElectionSize, Module, NominatorIndex, Nominators, OffchainAccuracy,
-	Trait, ValidatorIndex, WeightInfo,
+	Config, ValidatorIndex, WeightInfo,
 };
 use codec::Decode;
 use frame_support::{traits::Get, weights::Weight, IterableStorageMap};
@@ -71,7 +71,7 @@ pub(crate) const DEFAULT_LONGEVITY: u64 = 25;
 /// don't run twice within a window of length [`OFFCHAIN_REPEAT`].
 ///
 /// Returns `Ok(())` if offchain worker should happen, `Err(reason)` otherwise.
-pub(crate) fn set_check_offchain_execution_status<T: Trait>(
+pub(crate) fn set_check_offchain_execution_status<T: Config>(
 	now: T::BlockNumber,
 ) -> Result<(), &'static str> {
 	let storage = StorageValueRef::persistent(&OFFCHAIN_HEAD_DB);
@@ -108,7 +108,7 @@ pub(crate) fn set_check_offchain_execution_status<T: Trait>(
 /// The internal logic of the offchain worker of this module. This runs the phragmen election,
 /// compacts and reduces the solution, computes the score and submits it back to the chain as an
 /// unsigned transaction, without any signature.
-pub(crate) fn compute_offchain_election<T: Trait>() -> Result<(), OffchainElectionError> {
+pub(crate) fn compute_offchain_election<T: Config>() -> Result<(), OffchainElectionError> {
 	let iters = get_balancing_iters::<T>();
 	// compute raw solution. Note that we use `OffchainAccuracy`.
 	let ElectionResult {
@@ -151,7 +151,7 @@ pub(crate) fn compute_offchain_election<T: Trait>() -> Result<(), OffchainElecti
 /// Get a random number of iterations to run the balancing.
 ///
 /// Uses the offchain seed to generate a random number.
-pub fn get_balancing_iters<T: Trait>() -> usize {
+pub fn get_balancing_iters<T: Config>() -> usize {
 	match T::MaxIterations::get() {
 		0 => 0,
 		max @ _ => {
@@ -257,7 +257,7 @@ pub fn maximum_compact_len<W: crate::WeightInfo>(
 ///
 /// Indeed, the score must be computed **after** this step. If this step reduces the score too much,
 /// then the solution will be discarded.
-pub fn trim_to_weight<T: Trait, FN>(
+pub fn trim_to_weight<T: Config, FN>(
 	maximum_allowed_voters: u32,
 	mut compact: CompactAssignments,
 	nominator_index: FN,
@@ -318,7 +318,7 @@ where
 /// Takes an election result and spits out some data that can be submitted to the chain.
 ///
 /// This does a lot of stuff; read the inline comments.
-pub fn prepare_submission<T: Trait>(
+pub fn prepare_submission<T: Config>(
 	assignments: Vec<Assignment<T::AccountId, OffchainAccuracy>>,
 	winners: Vec<(T::AccountId, ExtendedBalance)>,
 	do_reduce: bool,
diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs
index af9a92f16a463..b1f0c9d9a4427 100644
--- a/frame/staking/src/slashing.rs
+++ b/frame/staking/src/slashing.rs
@@ -50,7 +50,7 @@
 //! Based on research at https://research.web3.foundation/en/latest/polkadot/slashing/npos/
 
 use super::{
-	EraIndex, Trait, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
+	EraIndex, Config, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface,
 	NegativeImbalanceOf, UnappliedSlash, Error,
 };
 use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug, DispatchResult};
@@ -190,7 +190,7 @@ impl<Balance> SpanRecord<Balance> {
 
 /// Parameters for performing a slash.
 #[derive(Clone)]
-pub(crate) struct SlashParams<'a, T: 'a + Trait> {
+pub(crate) struct SlashParams<'a, T: 'a + Config> {
 	/// The stash account being slashed.
 	pub(crate) stash: &'a T::AccountId,
 	/// The proportion of the slash.
@@ -214,7 +214,7 @@ pub(crate) struct SlashParams<'a, T: 'a + Trait> {
 ///
 /// The pending slash record returned does not have initialized reporters. Those have
 /// to be set at a higher level, if any.
-pub(crate) fn compute_slash<T: Trait>(params: SlashParams<T>)
+pub(crate) fn compute_slash<T: Config>(params: SlashParams<T>)
 	-> Option<UnappliedSlash<T::AccountId, BalanceOf<T>>>
 {
 	let SlashParams {
@@ -309,7 +309,7 @@ pub(crate) fn compute_slash<T: Trait>(params: SlashParams<T>)
 
 // doesn't apply any slash, but kicks out the validator if the misbehavior is from
 // the most recent slashing span.
-fn kick_out_if_recent<T: Trait>(
+fn kick_out_if_recent<T: Config>(
 	params: SlashParams<T>,
 ) {
 	// these are not updated by era-span or end-span.
@@ -338,7 +338,7 @@ fn kick_out_if_recent<T: Trait>(
 /// Slash nominators. Accepts general parameters and the prior slash percentage of the validator.
 ///
 /// Returns the amount of reward to pay out.
-fn slash_nominators<T: Trait>(
+fn slash_nominators<T: Config>(
 	params: SlashParams<T>,
 	prior_slash_p: Perbill,
 	nominators_slashed: &mut Vec<(T::AccountId, BalanceOf<T>)>,
@@ -418,7 +418,7 @@ fn slash_nominators<T: Trait>(
 // dropping this struct applies any necessary slashes, which can lead to free balance
 // being 0, and the account being garbage-collected -- a dead account should get no new
 // metadata.
-struct InspectingSpans<'a, T: Trait + 'a> {
+struct InspectingSpans<'a, T: Config + 'a> {
 	dirty: bool,
 	window_start: EraIndex,
 	stash: &'a T::AccountId,
@@ -430,7 +430,7 @@ struct InspectingSpans<'a, T: Trait + 'a> {
 }
 
 // fetches the slashing spans record for a stash account, initializing it if necessary.
-fn fetch_spans<'a, T: Trait + 'a>(
+fn fetch_spans<'a, T: Config + 'a>(
 	stash: &'a T::AccountId,
 	window_start: EraIndex,
 	paid_out: &'a mut BalanceOf<T>,
@@ -455,7 +455,7 @@ fn fetch_spans<'a, T: Trait + 'a>(
 	}
 }
 
-impl<'a, T: 'a + Trait> InspectingSpans<'a, T> {
+impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 	fn span_index(&self) -> SpanIndex {
 		self.spans.span_index
 	}
@@ -526,7 +526,7 @@ impl<'a, T: 'a + Trait> InspectingSpans<'a, T> {
 	}
 }
 
-impl<'a, T: 'a + Trait> Drop for InspectingSpans<'a, T> {
+impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> {
 	fn drop(&mut self) {
 		// only update on disk if we slashed this account.
 		if !self.dirty { return }
@@ -542,13 +542,13 @@ impl<'a, T: 'a + Trait> Drop for InspectingSpans<'a, T> {
 }
 
 /// Clear slashing metadata for an obsolete era.
-pub(crate) fn clear_era_metadata<T: Trait>(obsolete_era: EraIndex) {
+pub(crate) fn clear_era_metadata<T: Config>(obsolete_era: EraIndex) {
 	<Module<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era);
 	<Module<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era);
 }
 
 /// Clear slashing metadata for a dead account.
-pub(crate) fn clear_stash_metadata<T: Trait>(
+pub(crate) fn clear_stash_metadata<T: Config>(
 	stash: &T::AccountId,
 	num_slashing_spans: u32,
 ) -> DispatchResult {
@@ -576,7 +576,7 @@ pub(crate) fn clear_stash_metadata<T: Trait>(
 // apply the slash to a stash account, deducting any missing funds from the reward
 // payout, saturating at 0. this is mildly unfair but also an edge-case that
 // can only occur when overlapping locked funds have been slashed.
-pub fn do_slash<T: Trait>(
+pub fn do_slash<T: Config>(
 	stash: &T::AccountId,
 	value: BalanceOf<T>,
 	reward_payout: &mut BalanceOf<T>,
@@ -613,7 +613,7 @@ pub fn do_slash<T: Trait>(
 }
 
 /// Apply a previously-unapplied slash.
-pub(crate) fn apply_slash<T: Trait>(unapplied_slash: UnappliedSlash<T::AccountId, BalanceOf<T>>) {
+pub(crate) fn apply_slash<T: Config>(unapplied_slash: UnappliedSlash<T::AccountId, BalanceOf<T>>) {
 	let mut slashed_imbalance = NegativeImbalanceOf::<T>::zero();
 	let mut reward_payout = unapplied_slash.payout;
 
@@ -638,7 +638,7 @@ pub(crate) fn apply_slash<T: Trait>(unapplied_slash: UnappliedSlash<T::AccountId
 
 
 /// Apply a reward payout to some reporters, paying the rewards out of the slashed imbalance.
-fn pay_reporters<T: Trait>(
+fn pay_reporters<T: Config>(
 	reward_payout: BalanceOf<T>,
 	slashed_imbalance: NegativeImbalanceOf<T>,
 	reporters: &[T::AccountId],
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 25cfffeac2c14..9b6df1f2d48d2 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -29,13 +29,13 @@ use sp_npos_elections::*;
 const SEED: u32 = 0;
 
 /// This function removes all validators and nominators from storage.
-pub fn clear_validators_and_nominators<T: Trait>() {
+pub fn clear_validators_and_nominators<T: Config>() {
 	Validators::<T>::remove_all();
 	Nominators::<T>::remove_all();
 }
 
 /// Grab a funded user.
-pub fn create_funded_user<T: Trait>(
+pub fn create_funded_user<T: Config>(
 	string: &'static str,
 	n: u32,
 	balance_factor: u32,
@@ -49,7 +49,7 @@ pub fn create_funded_user<T: Trait>(
 }
 
 /// Create a stash and controller pair.
-pub fn create_stash_controller<T: Trait>(
+pub fn create_stash_controller<T: Config>(
 	n: u32,
 	balance_factor: u32,
 	destination: RewardDestination<T::AccountId>,
@@ -66,7 +66,7 @@ pub fn create_stash_controller<T: Trait>(
 
 /// Create a stash and controller pair, where the controller is dead, and payouts go to controller.
 /// This is used to test worst case payout scenarios.
-pub fn create_stash_and_dead_controller<T: Trait>(
+pub fn create_stash_and_dead_controller<T: Config>(
 	n: u32,
 	balance_factor: u32,
 	destination: RewardDestination<T::AccountId>,
@@ -83,7 +83,7 @@ pub fn create_stash_and_dead_controller<T: Trait>(
 }
 
 /// create `max` validators.
-pub fn create_validators<T: Trait>(
+pub fn create_validators<T: Config>(
 	max: u32,
 	balance_factor: u32,
 ) -> Result<Vec<<T::Lookup as StaticLookup>::Source>, &'static str> {
@@ -115,7 +115,7 @@ pub fn create_validators<T: Trait>(
 ///    Else, all of them are considered and `edge_per_nominator` random validators are voted for.
 ///
 /// Return the validators choosen to be nominated.
-pub fn create_validators_with_nominators_for_era<T: Trait>(
+pub fn create_validators_with_nominators_for_era<T: Config>(
 	validators: u32,
 	nominators: u32,
 	edge_per_nominator: usize,
@@ -173,7 +173,7 @@ pub fn create_validators_with_nominators_for_era<T: Trait>(
 
 /// Build a _really bad_ but acceptable solution for election. This should always yield a solution
 /// which has a less score than the seq-phragmen.
-pub fn get_weak_solution<T: Trait>(
+pub fn get_weak_solution<T: Config>(
 	do_reduce: bool,
 ) -> (Vec<ValidatorIndex>, CompactAssignments, ElectionScore, ElectionSize) {
 	let mut backing_stake_of: BTreeMap<T::AccountId, BalanceOf<T>> = BTreeMap::new();
@@ -282,7 +282,7 @@ pub fn get_weak_solution<T: Trait>(
 
 /// Create a solution for seq-phragmen. This uses the same internal function as used by the offchain
 /// worker code.
-pub fn get_seq_phragmen_solution<T: Trait>(
+pub fn get_seq_phragmen_solution<T: Config>(
 	do_reduce: bool,
 ) -> (
 	Vec<ValidatorIndex>,
@@ -307,7 +307,7 @@ pub fn get_seq_phragmen_solution<T: Trait>(
 }
 
 /// Returns a solution in which only one winner is elected with just a self vote.
-pub fn get_single_winner_solution<T: Trait>(
+pub fn get_single_winner_solution<T: Config>(
 	winner: T::AccountId,
 ) -> Result<
 	(
@@ -352,7 +352,7 @@ pub fn get_single_winner_solution<T: Trait>(
 }
 
 /// get the active era.
-pub fn current_era<T: Trait>() -> EraIndex {
+pub fn current_era<T: Config>() -> EraIndex {
 	<Module<T>>::current_era().unwrap_or(0)
 }
 
@@ -366,7 +366,7 @@ pub fn init_active_era() {
 
 /// Create random assignments for the given list of winners. Each assignment will have
 /// MAX_NOMINATIONS edges.
-pub fn create_assignments_for_offchain<T: Trait>(
+pub fn create_assignments_for_offchain<T: Config>(
 	num_assignments: u32,
 	winners: Vec<<T::Lookup as StaticLookup>::Source>,
 ) -> Result<
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
index 2a02d87aa2c57..c50964a33bb13 100644
--- a/frame/staking/src/tests.rs
+++ b/frame/staking/src/tests.rs
@@ -3267,7 +3267,7 @@ mod offchain_election {
 						ElectionSize::default(),
 					),
 					Error::<Test>::OffchainElectionEarlySubmission,
-					Some(<Test as frame_system::Trait>::DbWeight::get().reads(1)),
+					Some(<Test as frame_system::Config>::DbWeight::get().reads(1)),
 				);
 			})
 	}
@@ -3303,7 +3303,7 @@ mod offchain_election {
 						score,
 					),
 					Error::<Test>::OffchainElectionWeakSubmission,
-					Some(<Test as frame_system::Trait>::DbWeight::get().reads(3))
+					Some(<Test as frame_system::Config>::DbWeight::get().reads(3))
 				);
 			})
 	}
@@ -4340,7 +4340,7 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 	//   then the nominator can't claim its reward
 	// * A nominator can't claim another nominator reward
 	ExtBuilder::default().build_and_execute(|| {
-		for i in 0..=<Test as Trait>::MaxNominatorRewardedPerValidator::get() {
+		for i in 0..=<Test as Config>::MaxNominatorRewardedPerValidator::get() {
 			let stash = 10_000 + i as AccountId;
 			let controller = 20_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
@@ -4366,7 +4366,7 @@ fn test_max_nominator_rewarded_per_validator_and_cant_steal_someone_else_reward(
 		mock::make_all_reward_payment(1);
 
 		// Assert only nominators from 1 to Max are rewarded
-		for i in 0..=<Test as Trait>::MaxNominatorRewardedPerValidator::get() {
+		for i in 0..=<Test as Config>::MaxNominatorRewardedPerValidator::get() {
 			let stash = 10_000 + i as AccountId;
 			let balance = 10_000 + i as Balance;
 			if stash == 10_000 {
@@ -4569,14 +4569,14 @@ fn bond_during_era_correctly_populates_claimed_rewards() {
 fn offences_weight_calculated_correctly() {
 	ExtBuilder::default().nominate(true).build_and_execute(|| {
 		// On offence with zero offenders: 4 Reads, 1 Write
-		let zero_offence_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1);
+		let zero_offence_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1);
 		assert_eq!(Staking::on_offence(&[], &[Perbill::from_percent(50)], 0), Ok(zero_offence_weight));
 
 		// On Offence with N offenders, Unapplied: 4 Reads, 1 Write + 4 Reads, 5 Writes
-		let n_offence_unapplied_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 5);
+		let n_offence_unapplied_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 5);
 
-		let offenders: Vec<OffenceDetails<<Test as frame_system::Trait>::AccountId, pallet_session::historical::IdentificationTuple<Test>>>
+		let offenders: Vec<OffenceDetails<<Test as frame_system::Config>::AccountId, pallet_session::historical::IdentificationTuple<Test>>>
 			= (1..10).map(|i|
 				OffenceDetails {
 					offender: (i, Staking::eras_stakers(Staking::active_era().unwrap().index, i)),
@@ -4595,14 +4595,14 @@ fn offences_weight_calculated_correctly() {
 
 		let n = 1; // Number of offenders
 		let rw = 3 + 3 * n; // rw reads and writes
-		let one_offence_unapplied_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4, 1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(rw, rw)
+		let one_offence_unapplied_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4, 1)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(rw, rw)
 			// One `slash_cost`
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(6, 5)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(6, 5)
 			// `slash_cost` * nominators (1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(6, 5)
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(6, 5)
 			// `reward_cost` * reporters (1)
-			+ <Test as frame_system::Trait>::DbWeight::get().reads_writes(2, 2);
+			+ <Test as frame_system::Config>::DbWeight::get().reads_writes(2, 2);
 
 		assert_eq!(Staking::on_offence(&one_offender, &[Perbill::from_percent(50)], 0), Ok(one_offence_unapplied_weight));
 	});
@@ -4614,7 +4614,7 @@ fn on_initialize_weight_is_correct() {
 		assert_eq!(Validators::<Test>::iter().count(), 0);
 		assert_eq!(Nominators::<Test>::iter().count(), 0);
 		// When this pallet has nothing, we do 4 reads each block
-		let base_weight = <Test as frame_system::Trait>::DbWeight::get().reads(4);
+		let base_weight = <Test as frame_system::Config>::DbWeight::get().reads(4);
 		assert_eq!(base_weight, Staking::on_initialize(0));
 	});
 
@@ -4636,7 +4636,7 @@ fn on_initialize_weight_is_correct() {
 		// With 4 validators and 5 nominator, we should increase weight by:
 		// - (4 + 5) reads
 		// - 3 Writes
-		let final_weight = <Test as frame_system::Trait>::DbWeight::get().reads_writes(4 + 9, 3);
+		let final_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(4 + 9, 3);
 		assert_eq!(final_weight, Staking::on_initialize(System::block_number()));
 	});
 }
diff --git a/frame/staking/src/weights.rs b/frame/staking/src/weights.rs
index cb301276e0f05..2e715c53356fc 100644
--- a/frame/staking/src/weights.rs
+++ b/frame/staking/src/weights.rs
@@ -72,7 +72,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_staking using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
 		(99_659_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs
index 0d21e44326668..479fcfd8f7987 100644
--- a/frame/sudo/src/lib.rs
+++ b/frame/sudo/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Sudo Module
 //!
-//! - [`sudo::Trait`](./trait.Trait.html)
+//! - [`sudo::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -55,10 +55,10 @@
 //! use frame_support::{decl_module, dispatch};
 //! use frame_system::ensure_root;
 //!
-//! pub trait Trait: frame_system::Trait {}
+//! pub trait Config: frame_system::Config {}
 //!
 //! decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //!         pub fn privileged_function(origin) -> dispatch::DispatchResult {
 //!             ensure_root(origin)?;
@@ -82,7 +82,7 @@
 //! * [Democracy](../pallet_democracy/index.html)
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 //! [`Origin`]: https://docs.substrate.dev/docs/substrate-types
 
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -105,9 +105,9 @@ mod mock;
 #[cfg(test)]
 mod tests;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// A sudo-able call.
 	type Call: Parameter + UnfilteredDispatchable<Origin=Self::Origin> + GetDispatchInfo;
@@ -115,7 +115,7 @@ pub trait Trait: frame_system::Trait {
 
 decl_module! {
 	/// Sudo module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -131,7 +131,7 @@ decl_module! {
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
 		#[weight = (call.get_dispatch_info().weight + 10_000, call.get_dispatch_info().class)]
-		fn sudo(origin, call: Box<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn sudo(origin, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
@@ -153,7 +153,7 @@ decl_module! {
 		/// - The weight of this call is defined by the caller.
 		/// # </weight>
 		#[weight = (*_weight, call.get_dispatch_info().class)]
-		fn sudo_unchecked_weight(origin, call: Box<<T as Trait>::Call>, _weight: Weight) -> DispatchResultWithPostInfo {
+		fn sudo_unchecked_weight(origin, call: Box<<T as Config>::Call>, _weight: Weight) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
 			ensure!(sender == Self::key(), Error::<T>::RequireSudo);
@@ -206,7 +206,7 @@ decl_module! {
 		)]
 		fn sudo_as(origin,
 			who: <T::Lookup as StaticLookup>::Source,
-			call: Box<<T as Trait>::Call>
+			call: Box<<T as Config>::Call>
 		) -> DispatchResultWithPostInfo {
 			// This is a public call, so we ensure that the origin is some signed account.
 			let sender = ensure_signed(origin)?;
@@ -230,7 +230,7 @@ decl_module! {
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 		/// A sudo just took place. \[result\]
 		Sudid(DispatchResult),
 		/// The \[sudoer\] just switched identity; the old key is supplied.
@@ -241,7 +241,7 @@ decl_event!(
 );
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Sudo {
+	trait Store for Module<T: Config> as Sudo {
 		/// The `AccountId` of the sudo key.
 		Key get(fn key) config(): T::AccountId;
 	}
@@ -249,7 +249,7 @@ decl_storage! {
 
 decl_error! {
 	/// Error for the Sudo module
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Sender must be the Sudo account
 		RequireSudo,
 	}
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 7996cd05d071f..c21f7895264b0 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -33,26 +33,26 @@ pub mod logger {
 	use super::*;
 	use frame_system::ensure_root;
 
-	pub trait Trait: frame_system::Trait {
-		type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	pub trait Config: frame_system::Config {
+		type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 	}
 
 	decl_storage! {
-		trait Store for Module<T: Trait> as Logger {
+		trait Store for Module<T: Config> as Logger {
 			AccountLog get(fn account_log): Vec<T::AccountId>;
 			I32Log get(fn i32_log): Vec<i32>;
 		}
 	}
 
 	decl_event! {
-		pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId {
+		pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId {
 			AppendI32(i32, Weight),
 			AppendI32AndAccount(AccountId, i32, Weight),
 		}
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
+		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
 			fn deposit_event() = default;
 
 			#[weight = *weight]
@@ -118,7 +118,7 @@ impl Filter<Call> for BlockEverything {
 	}
 }
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = BlockEverything;
 	type Origin = Origin;
 	type Call = Call;
@@ -146,13 +146,13 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-// Implement the logger module's `Trait` on the Test runtime.
-impl logger::Trait for Test {
+// Implement the logger module's `Config` on the Test runtime.
+impl logger::Config for Test {
 	type Event = TestEvent;
 }
 
-// Implement the sudo module's `Trait` on the Test runtime.
-impl Trait for Test {
+// Implement the sudo module's `Config` on the Test runtime.
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 }
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index a6fb58846cbad..8d3d1ce590040 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -35,7 +35,7 @@ use proc_macro::TokenStream;
 ///
 /// ```nocompile
 /// decl_storage! {
-/// 	trait Store for Module<T: Trait> as Example {
+/// 	trait Store for Module<T: Config> as Example {
 /// 		Foo get(fn foo) config(): u32=12;
 /// 		Bar: map hasher(identity) u32 => u32;
 /// 		pub Zed build(|config| vec![(0, 0)]): map hasher(identity) u32 => u32;
@@ -43,7 +43,7 @@ use proc_macro::TokenStream;
 /// }
 /// ```
 ///
-/// Declaration is set with the header `(pub) trait Store for Module<T: Trait> as Example`,
+/// Declaration is set with the header `(pub) trait Store for Module<T: Config> as Example`,
 /// with `Store` a (pub) trait generated associating each storage item to the `Module` and
 /// `as Example` setting the prefix used for storage items of this module. `Example` must be unique:
 /// another module with the same name and the same inner storage item name will conflict.
@@ -169,7 +169,7 @@ use proc_macro::TokenStream;
 ///
 /// ```nocompile
 /// decl_storage! {
-/// 	trait Store for Module<T: Trait> as Example {
+/// 	trait Store for Module<T: Config> as Example {
 ///
 /// 		// Your storage items
 /// 	}
@@ -202,7 +202,7 @@ use proc_macro::TokenStream;
 /// (`DefaultInstance` type is optional):
 ///
 /// ```nocompile
-/// trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Example {}
+/// trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Example {}
 /// ```
 ///
 /// Accessing the structure no requires the instance as generic parameter:
@@ -214,7 +214,7 @@ use proc_macro::TokenStream;
 /// This macro supports a where clause which will be replicated to all generated types.
 ///
 /// ```nocompile
-/// trait Store for Module<T: Trait> as Example where T::AccountId: std::fmt::Display {}
+/// trait Store for Module<T: Config> as Example where T::AccountId: std::fmt::Display {}
 /// ```
 ///
 /// ## Limitations
diff --git a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
index 6339134ea0d22..93543075a3d2b 100644
--- a/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
+++ b/frame/support/procedural/src/storage/genesis_config/genesis_config_def.rs
@@ -33,11 +33,11 @@ pub struct GenesisConfigFieldDef {
 pub struct GenesisConfigDef {
 	pub is_generic: bool,
 	pub fields: Vec<GenesisConfigFieldDef>,
-	/// For example: `<T: Trait<I>, I: Instance=DefaultInstance>`.
+	/// For example: `<T: Config<I>, I: Instance=DefaultInstance>`.
 	pub genesis_struct_decl: TokenStream,
 	/// For example: `<T, I>`.
 	pub genesis_struct: TokenStream,
-	/// For example: `<T: Trait<I>, I: Instance>`.
+	/// For example: `<T: Config<I>, I: Instance>`.
 	pub genesis_impl: TokenStream,
 	/// The where clause to use to constrain generics if genesis config is generic.
 	pub genesis_where_clause: Option<syn::WhereClause>,
diff --git a/frame/support/procedural/src/storage/mod.rs b/frame/support/procedural/src/storage/mod.rs
index 0aa0a3cad7cd1..bc23dad74bcd5 100644
--- a/frame/support/procedural/src/storage/mod.rs
+++ b/frame/support/procedural/src/storage/mod.rs
@@ -42,7 +42,7 @@ pub struct DeclStorageDef {
 	module_name: syn::Ident,
 	/// Usually `T`.
 	module_runtime_generic: syn::Ident,
-	/// Usually `Trait`
+	/// Usually `Config`
 	module_runtime_trait: syn::Path,
 	/// For instantiable module: usually `I: Instance=DefaultInstance`.
 	module_instance: Option<ModuleInstanceDef>,
@@ -77,7 +77,7 @@ pub struct DeclStorageDefExt {
 	module_name: syn::Ident,
 	/// Usually `T`.
 	module_runtime_generic: syn::Ident,
-	/// Usually `Trait`.
+	/// Usually `Config`.
 	module_runtime_trait: syn::Path,
 	/// For instantiable module: usually `I: Instance=DefaultInstance`.
 	module_instance: Option<ModuleInstanceDef>,
@@ -93,7 +93,7 @@ pub struct DeclStorageDefExt {
 	crate_name: syn::Ident,
 	/// Full struct expansion: `Module<T, I>`.
 	module_struct: proc_macro2::TokenStream,
-	/// Impl block for module: `<T: Trait, I: Instance>`.
+	/// Impl block for module: `<T: Config, I: Instance>`.
 	module_impl: proc_macro2::TokenStream,
 	/// For instantiable: `I`.
 	optional_instance: Option<proc_macro2::TokenStream>,
@@ -212,7 +212,7 @@ pub struct StorageLineDefExt {
 	storage_struct: proc_macro2::TokenStream,
 	/// If storage is generic over runtime then `T`.
 	optional_storage_runtime_comma: Option<proc_macro2::TokenStream>,
-	/// If storage is generic over runtime then `T: Trait`.
+	/// If storage is generic over runtime then `T: Config`.
 	optional_storage_runtime_bound_comma: Option<proc_macro2::TokenStream>,
 	/// The where clause to use to constrain generics if storage is generic over runtime.
 	optional_storage_where_clause: Option<proc_macro2::TokenStream>,
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index d55faa28d115b..2477f9421ffec 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -72,9 +72,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{Trait, ensure_signed};
+/// # use frame_system::{Config, ensure_signed};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 ///
 /// 		// Private functions are dispatchable, but not available to other
 /// 		// FRAME pallets.
@@ -98,7 +98,7 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 ///
 /// The declaration is set with the header where:
 ///
-/// * `Module`: The struct generated by the macro, with type `Trait`.
+/// * `Module`: The struct generated by the macro, with type `Config`.
 /// * `Call`: The enum generated for every pallet, which implements [`Callable`](./dispatch/trait.Callable.html).
 /// * `origin`: Alias of `T::Origin`, declared by the [`impl_outer_origin!`](./macro.impl_outer_origin.html) macro.
 /// * `Result`: The expected return type from pallet functions.
@@ -114,9 +114,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{Trait, ensure_signed};
+/// # use frame_system::{Config, ensure_signed};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 /// 		fn my_long_function(origin) -> dispatch::DispatchResult {
 ///				// Your implementation
@@ -149,9 +149,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo};
-/// # use frame_system::{Trait, ensure_signed};
+/// # use frame_system::{Config, ensure_signed};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 1_000_000]
 /// 		fn my_long_function(origin, do_expensive_calc: bool) -> DispatchResultWithPostInfo {
 /// 			ensure_signed(origin).map_err(|e| e.with_weight(100_000))?;
@@ -178,9 +178,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::transactional;
-/// # use frame_system::Trait;
+/// # use frame_system::Config;
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 /// 		#[transactional]
 /// 		fn my_short_function(origin) {
@@ -199,9 +199,9 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # #[macro_use]
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
-/// # use frame_system::{Trait, ensure_signed, ensure_root};
+/// # use frame_system::{Config, ensure_signed, ensure_root};
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 /// 		#[weight = 0]
 ///			fn my_privileged_function(origin) -> dispatch::DispatchResult {
 /// 			ensure_root(origin)?;
@@ -236,10 +236,10 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # pub struct DefaultInstance;
 /// # pub trait Instance: 'static {}
 /// # impl Instance for DefaultInstance {}
-/// pub trait Trait<I: Instance=DefaultInstance>: frame_system::Trait {}
+/// pub trait Config<I: Instance=DefaultInstance>: frame_system::Config {}
 ///
 /// decl_module! {
-/// 	pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
+/// 	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::Origin {
 /// 		// Your implementation
 /// 	}
 /// }
@@ -261,10 +261,10 @@ impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// # extern crate frame_support;
 /// # use frame_support::dispatch;
 /// # use frame_system::{self as system, ensure_signed};
-/// pub trait Trait: system::Trait where Self::AccountId: From<u32> {}
+/// pub trait Config: system::Config where Self::AccountId: From<u32> {}
 ///
 /// decl_module! {
-/// 	pub struct Module<T: Trait> for enum Call where origin: T::Origin, T::AccountId: From<u32> {
+/// 	pub struct Module<T: Config> for enum Call where origin: T::Origin, T::AccountId: From<u32> {
 /// 		// Your implementation
 /// 	}
 /// }
@@ -1272,11 +1272,11 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_initialize() -> $return:ty { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnInitialize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnInitialize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
-			fn on_initialize(_block_number_not_used: <$trait_instance as $system::Trait>::BlockNumber) -> $return {
+			fn on_initialize(_block_number_not_used: <$trait_instance as $system::Config>::BlockNumber) -> $return {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_initialize"));
 				{ $( $impl )* }
 			}
@@ -1289,8 +1289,8 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_initialize($param:ident : $param_ty:ty) -> $return:ty { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnInitialize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnInitialize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn on_initialize($param: $param_ty) -> $return {
@@ -1305,8 +1305,8 @@ macro_rules! decl_module {
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnInitialize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnInitialize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{}
 	};
@@ -1326,10 +1326,10 @@ macro_rules! decl_module {
 				let result: $return = (|| { $( $impl )* })();
 
 				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 
 				let additional_write = <
-					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
+					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1);
 
 				result.saturating_add(additional_write)
@@ -1350,10 +1350,10 @@ macro_rules! decl_module {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_runtime_upgrade"));
 
 				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 
 				<
-					<$trait_instance as $system::Trait>::DbWeight as $crate::traits::Get<_>
+					<$trait_instance as $system::Config>::DbWeight as $crate::traits::Get<_>
 				>::get().writes(1)
 			}
 		}
@@ -1394,11 +1394,11 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_finalize() { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnFinalize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnFinalize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
-			fn on_finalize(_block_number_not_used: <$trait_instance as $system::Trait>::BlockNumber) {
+			fn on_finalize(_block_number_not_used: <$trait_instance as $system::Config>::BlockNumber) {
 				$crate::sp_tracing::enter_span!($crate::sp_tracing::trace_span!("on_finalize"));
 				{ $( $impl )* }
 			}
@@ -1411,8 +1411,8 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn on_finalize($param:ident : $param_ty:ty) { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnFinalize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnFinalize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn on_finalize($param: $param_ty) {
@@ -1427,8 +1427,8 @@ macro_rules! decl_module {
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OnFinalize<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OnFinalize<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 		}
@@ -1440,11 +1440,11 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn offchain_worker() { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OffchainWorker<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OffchainWorker<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
-			fn offchain_worker(_block_number_not_used: <$trait_instance as $system::Trait>::BlockNumber) { $( $impl )* }
+			fn offchain_worker(_block_number_not_used: <$trait_instance as $system::Config>::BlockNumber) { $( $impl )* }
 		}
 	};
 
@@ -1454,8 +1454,8 @@ macro_rules! decl_module {
 		{ $( $other_where_bounds:tt )* }
 		fn offchain_worker($param:ident : $param_ty:ty) { $( $impl:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OffchainWorker<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OffchainWorker<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{
 			fn offchain_worker($param: $param_ty) { $( $impl )* }
@@ -1467,8 +1467,8 @@ macro_rules! decl_module {
 		$module:ident<$trait_instance:ident: $trait_name:ident$(<I>, $instance:ident: $instantiable:path)?>;
 		{ $( $other_where_bounds:tt )* }
 	) => {
-		impl<$trait_instance: $system::Trait + $trait_name$(<I>, $instance: $instantiable)?>
-			$crate::traits::OffchainWorker<<$trait_instance as $system::Trait>::BlockNumber>
+		impl<$trait_instance: $system::Config + $trait_name$(<I>, $instance: $instantiable)?>
+			$crate::traits::OffchainWorker<<$trait_instance as $system::Config>::BlockNumber>
 			for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )*
 		{}
 	};
@@ -1824,7 +1824,7 @@ macro_rules! decl_module {
 
 			fn storage_version() -> Option<$crate::traits::PalletVersion> {
 				let key = $crate::traits::PalletVersion::storage_key::<
-						<$trait_instance as $system::Trait>::PalletInfo, Self
+						<$trait_instance as $system::Config>::PalletInfo, Self
 					>().expect("Every active pallet has a name in the runtime; qed");
 
 				$crate::storage::unhashed::get(&key)
@@ -1837,7 +1837,7 @@ macro_rules! decl_module {
 		{
 			fn on_genesis() {
 				$crate::crate_to_pallet_version!()
-					.put_into_storage::<<$trait_instance as $system::Trait>::PalletInfo, Self>();
+					.put_into_storage::<<$trait_instance as $system::Config>::PalletInfo, Self>();
 			}
 		}
 
@@ -2019,7 +2019,7 @@ macro_rules! impl_outer_dispatch {
 		}
 		impl $crate::dispatch::Dispatchable for $call_type {
 			type Origin = $origin;
-			type Trait = $call_type;
+			type Config = $call_type;
 			type Info = $crate::weights::DispatchInfo;
 			type PostInfo = $crate::weights::PostDispatchInfo;
 			fn dispatch(
@@ -2412,12 +2412,12 @@ mod tests {
 		IntegrityTest, Get,
 	};
 
-	pub trait Trait: system::Trait + Sized where Self::AccountId: From<u32> { }
+	pub trait Config: system::Config + Sized where Self::AccountId: From<u32> { }
 
 	pub mod system {
 		use super::*;
 
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
@@ -2443,11 +2443,11 @@ mod tests {
 			}
 		}
 
-		pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system = system, T::AccountId: From<u32> {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system = system, T::AccountId: From<u32> {
 			/// Hi, this is a comment.
 			#[weight = 0]
 			fn aux_0(_origin) -> DispatchResult { unreachable!() }
@@ -2548,7 +2548,7 @@ mod tests {
 	];
 
 	pub struct TraitImpl {}
-	impl Trait for TraitImpl { }
+	impl Config for TraitImpl { }
 
 	type Test = Module<TraitImpl>;
 
@@ -2562,7 +2562,7 @@ mod tests {
 		}
 	}
 
-	impl system::Trait for TraitImpl {
+	impl system::Config for TraitImpl {
 		type Origin = OuterOrigin;
 		type AccountId = u32;
 		type Call = OuterCall;
diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index c0a886907d0b6..0e3f66f9f3c95 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -39,7 +39,7 @@ pub use frame_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 /// #
 /// decl_error! {
 ///     /// Errors that can occur in my module.
-///     pub enum MyError for Module<T: Trait> {
+///     pub enum MyError for Module<T: Config> {
 ///         /// Hey this is an error message that indicates bla.
 ///         MyCoolErrorMessage,
 ///         /// You are just not cool enough for my module!
@@ -47,13 +47,13 @@ pub use frame_metadata::{ModuleErrorMetadata, ErrorMetadata, DecodeDifferent};
 ///     }
 /// }
 ///
-/// # use frame_system::Trait;
+/// # use frame_system::Config;
 ///
 /// // You need to register the error type in `decl_module!` as well to make the error
 /// // exported in the metadata.
 ///
 /// decl_module! {
-///     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+///     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 ///         type Error = MyError<T>;
 ///
 ///         #[weight = 0]
diff --git a/frame/support/src/event.rs b/frame/support/src/event.rs
index 3538748c30faf..3cb91e4a3e31b 100644
--- a/frame/support/src/event.rs
+++ b/frame/support/src/event.rs
@@ -37,7 +37,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// # Generic Event Example:
 ///
 /// ```rust
-/// trait Trait {
+/// trait Config {
 ///     type Balance;
 ///     type Token;
 /// }
@@ -45,7 +45,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// mod event1 {
 ///     // Event that specifies the generic parameter explicitly (`Balance`).
 ///     frame_support::decl_event!(
-///        pub enum Event<T> where Balance = <T as super::Trait>::Balance {
+///        pub enum Event<T> where Balance = <T as super::Config>::Balance {
 ///           Message(Balance),
 ///        }
 ///     );
@@ -56,7 +56,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///     // If no name for the generic parameter is specified explicitly,
 ///     // the name will be taken from the type name of the trait.
 ///     frame_support::decl_event!(
-///        pub enum Event<T> where <T as super::Trait>::Balance {
+///        pub enum Event<T> where <T as super::Config>::Balance {
 ///           Message(Balance),
 ///        }
 ///     );
@@ -65,7 +65,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// mod event3 {
 ///     // And we even support declaring multiple generic parameters!
 ///     frame_support::decl_event!(
-///        pub enum Event<T> where <T as super::Trait>::Balance, <T as super::Trait>::Token {
+///        pub enum Event<T> where <T as super::Config>::Balance, <T as super::Config>::Token {
 ///           Message(Balance, Token),
 ///        }
 ///     );
@@ -82,7 +82,7 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 ///# struct DefaultInstance;
 ///# trait Instance {}
 ///# impl Instance for DefaultInstance {}
-/// trait Trait<I: Instance=DefaultInstance> {
+/// trait Config<I: Instance=DefaultInstance> {
 ///     type Balance;
 ///     type Token;
 /// }
@@ -90,8 +90,8 @@ pub use frame_metadata::{EventMetadata, DecodeDifferent, OuterEventMetadata, FnE
 /// // For module with instances, DefaultInstance is optional
 /// frame_support::decl_event!(
 ///    pub enum Event<T, I: Instance = DefaultInstance> where
-///       <T as Trait>::Balance,
-///       <T as Trait>::Token
+///       <T as Config>::Balance,
+///       <T as Config>::Token
 ///    {
 ///       Message(Balance, Token),
 ///    }
@@ -258,10 +258,10 @@ macro_rules! __decl_generic_event {
 		{ $( $events:tt )* };
 		{ ,$( $generic_param:ident = $generic_type:ty ),* };
 	) => {
-		/// [`RawEvent`] specialized for the configuration [`Trait`]
+		/// [`RawEvent`] specialized for the configuration [`Config`]
 		///
 		/// [`RawEvent`]: enum.RawEvent.html
-		/// [`Trait`]: trait.Trait.html
+		/// [`Config`]: trait.Config.html
 		pub type Event<$event_generic_param $(, $instance $( = $event_default_instance)? )?> = RawEvent<$( $generic_type ),* $(, $instance)? >;
 
 		#[derive(
@@ -551,7 +551,7 @@ mod tests {
 	use codec::{Encode, Decode};
 
 	mod system {
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type Origin;
 			type BlockNumber;
 			type PalletInfo: crate::traits::PalletInfo;
@@ -559,7 +559,7 @@ mod tests {
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 		}
 
 		decl_event!(
@@ -570,7 +570,7 @@ mod tests {
 	}
 
 	mod system_renamed {
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type Origin;
 			type BlockNumber;
 			type PalletInfo: crate::traits::PalletInfo;
@@ -578,7 +578,7 @@ mod tests {
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 		}
 
 		decl_event!(
@@ -591,17 +591,17 @@ mod tests {
 	mod event_module {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event without renaming the generic parameter `Balance` and `Origin`.
-			pub enum Event<T> where <T as Trait>::Balance, <T as system::Trait>::Origin
+			pub enum Event<T> where <T as Config>::Balance, <T as system::Config>::Origin
 			{
 				/// Hi, I am a comment.
 				TestEvent(Balance, Origin),
@@ -614,19 +614,19 @@ mod tests {
 	mod event_module2 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event with renamed generic parameter
 			pub enum Event<T> where
-				BalanceRenamed = <T as Trait>::Balance,
-				OriginRenamed = <T as system::Trait>::Origin
+				BalanceRenamed = <T as Config>::Balance,
+				OriginRenamed = <T as system::Config>::Origin
 			{
 				TestEvent(BalanceRenamed),
 				TestOrigin(OriginRenamed),
@@ -645,19 +645,19 @@ mod tests {
 	mod event_module4 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event finish formatting on an unnamed one with trailing comma
 			pub enum Event<T> where
-				<T as Trait>::Balance,
-				<T as system::Trait>::Origin,
+				<T as Config>::Balance,
+				<T as system::Config>::Origin,
 			{
 				TestEvent(Balance, Origin),
 			}
@@ -667,19 +667,19 @@ mod tests {
 	mod event_module5 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		decl_event!(
 			/// Event finish formatting on an named one with trailing comma
 			pub enum Event<T> where
-				BalanceRenamed = <T as Trait>::Balance,
-				OriginRenamed = <T as system::Trait>::Origin,
+				BalanceRenamed = <T as Config>::Balance,
+				OriginRenamed = <T as system::Config>::Origin,
 			{
 				TestEvent(BalanceRenamed, OriginRenamed),
 				TrailingCommaInArgs(
@@ -714,37 +714,37 @@ mod tests {
 		}
 	}
 
-	impl event_module::Trait for TestRuntime {
+	impl event_module::Config for TestRuntime {
 		type Balance = u32;
 	}
 
-	impl event_module2::Trait for TestRuntime {
+	impl event_module2::Config for TestRuntime {
 		type Balance = u32;
 	}
 
-	impl system::Trait for TestRuntime {
+	impl system::Config for TestRuntime {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl event_module::Trait for TestRuntime2 {
+	impl event_module::Config for TestRuntime2 {
 		type Balance = u32;
 	}
 
-	impl event_module2::Trait for TestRuntime2 {
+	impl event_module2::Config for TestRuntime2 {
 		type Balance = u32;
 	}
 
-	impl system_renamed::Trait for TestRuntime2 {
+	impl system_renamed::Config for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl system::Trait for TestRuntime2 {
+	impl system::Config for TestRuntime2 {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 3c191ed6ae454..55bca2610a18b 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -346,14 +346,14 @@ pub use frame_support_procedural::{
 /// This is useful for type generic over runtime:
 /// ```
 /// # use frame_support::CloneNoBound;
-/// trait Trait {
+/// trait Config {
 ///		type C: Clone;
 /// }
 ///
 /// // Foo implements [`Clone`] because `C` bounds [`Clone`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Clone`].
 /// #[derive(CloneNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -364,14 +364,14 @@ pub use frame_support_procedural::CloneNoBound;
 /// This is useful for type generic over runtime:
 /// ```
 /// # use frame_support::{EqNoBound, PartialEqNoBound};
-/// trait Trait {
+/// trait Config {
 ///		type C: Eq;
 /// }
 ///
 /// // Foo implements [`Eq`] because `C` bounds [`Eq`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Eq`].
 /// #[derive(PartialEqNoBound, EqNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -382,14 +382,14 @@ pub use frame_support_procedural::EqNoBound;
 /// This is useful for type generic over runtime:
 /// ```
 /// # use frame_support::PartialEqNoBound;
-/// trait Trait {
+/// trait Config {
 ///		type C: PartialEq;
 /// }
 ///
 /// // Foo implements [`PartialEq`] because `C` bounds [`PartialEq`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`PartialEq`].
 /// #[derive(PartialEqNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -401,14 +401,14 @@ pub use frame_support_procedural::PartialEqNoBound;
 /// ```
 /// # use frame_support::DebugNoBound;
 /// # use core::fmt::Debug;
-/// trait Trait {
+/// trait Config {
 ///		type C: Debug;
 /// }
 ///
 /// // Foo implements [`Debug`] because `C` bounds [`Debug`].
 /// // Otherwise compilation will fail with an output telling `c` doesn't implement [`Debug`].
 /// #[derive(DebugNoBound)]
-/// struct Foo<T: Trait> {
+/// struct Foo<T: Config> {
 ///		c: T::C,
 /// }
 /// ```
@@ -565,7 +565,7 @@ mod tests {
 	use sp_std::{marker::PhantomData, result};
 	use sp_io::TestExternalities;
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type BlockNumber: Codec + EncodeLike + Default;
 		type Origin;
 		type PalletInfo: crate::traits::PalletInfo;
@@ -575,16 +575,16 @@ mod tests {
 	mod module {
 		#![allow(dead_code)]
 
-		use super::Trait;
+		use super::Config;
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self  {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self  {}
 		}
 	}
 	use self::module::Module;
 
 	decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			pub Data get(fn data) build(|_| vec![(15u32, 42u64)]):
 				map hasher(twox_64_concat) u32 => u64;
 			pub OptionLinkedMap: map hasher(blake2_128_concat) u32 => Option<u32>;
@@ -606,7 +606,7 @@ mod tests {
 	}
 
 	struct Test;
-	impl Trait for Test {
+	impl Config for Test {
 		type BlockNumber = u32;
 		type Origin = u32;
 		type PalletInfo = ();
diff --git a/frame/support/src/metadata.rs b/frame/support/src/metadata.rs
index 80737e4b13d6f..f72365985da0a 100644
--- a/frame/support/src/metadata.rs
+++ b/frame/support/src/metadata.rs
@@ -27,23 +27,23 @@ pub use frame_metadata::{
 /// Example:
 /// ```
 ///# mod module0 {
-///#    pub trait Trait: 'static {
+///#    pub trait Config: 'static {
 ///#        type Origin;
 ///#        type BlockNumber;
 ///#        type PalletInfo: frame_support::traits::PalletInfo;
 ///#        type DbWeight: frame_support::traits::Get<frame_support::weights::RuntimeDbWeight>;
 ///#    }
 ///#    frame_support::decl_module! {
-///#        pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+///#        pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 ///#    }
 ///#
 ///#    frame_support::decl_storage! {
-///#        trait Store for Module<T: Trait> as TestStorage {}
+///#        trait Store for Module<T: Config> as TestStorage {}
 ///#    }
 ///# }
 ///# use module0 as module1;
 ///# use module0 as module2;
-///# impl module0::Trait for Runtime {
+///# impl module0::Config for Runtime {
 ///#     type Origin = u32;
 ///#     type BlockNumber = u32;
 ///#     type PalletInfo = ();
@@ -297,7 +297,7 @@ mod tests {
 	mod system {
 		use super::*;
 
-		pub trait Trait: 'static {
+		pub trait Config: 'static {
 			type BaseCallFilter;
 			const ASSOCIATED_CONST: u64 = 500;
 			type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
@@ -311,7 +311,7 @@ mod tests {
 		}
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 				/// Hi, I am a comment.
 				const BlockNumber: T::BlockNumber = 100.into();
 				const GetType: T::AccountId = T::SomeValue::get().into();
@@ -341,19 +341,19 @@ mod tests {
 			}
 		}
 
-		pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 	}
 
 	mod event_module {
 		use crate::dispatch::DispatchResult;
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_event!(
-			pub enum Event<T> where <T as Trait>::Balance
+			pub enum Event<T> where <T as Config>::Balance
 			{
 				/// Hi, I am a comment.
 				TestEvent(Balance),
@@ -361,7 +361,7 @@ mod tests {
 		);
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {
 				type Error = Error<T>;
 
 				#[weight = 0]
@@ -370,7 +370,7 @@ mod tests {
 		}
 
 		crate::decl_error! {
-			pub enum Error for Module<T: Trait> {
+			pub enum Error for Module<T: Config> {
 				/// Some user input error
 				UserInputError,
 				/// Something bad happened
@@ -383,23 +383,23 @@ mod tests {
 	mod event_module2 {
 		use super::system;
 
-		pub trait Trait: system::Trait {
+		pub trait Config: system::Config {
 			type Balance;
 		}
 
 		decl_event!(
-			pub enum Event<T> where <T as Trait>::Balance
+			pub enum Event<T> where <T as Config>::Balance
 			{
 				TestEvent(Balance),
 			}
 		);
 
 		decl_module! {
-			pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+			pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 		}
 
 		crate::decl_storage! {
-			trait Store for Module<T: Trait> as TestStorage {
+			trait Store for Module<T: Config> as TestStorage {
 				StorageMethod : Option<u32>;
 			}
 			add_extra_genesis {
@@ -433,11 +433,11 @@ mod tests {
 		}
 	}
 
-	impl event_module::Trait for TestRuntime {
+	impl event_module::Config for TestRuntime {
 		type Balance = u32;
 	}
 
-	impl event_module2::Trait for TestRuntime {
+	impl event_module2::Config for TestRuntime {
 		type Balance = u32;
 	}
 
@@ -445,7 +445,7 @@ mod tests {
 		pub const SystemValue: u32 = 600;
 	}
 
-	impl system::Trait for TestRuntime {
+	impl system::Config for TestRuntime {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type AccountId = u32;
@@ -480,7 +480,7 @@ mod tests {
 	struct ConstantAssociatedConstByteGetter;
 	impl DefaultByte for ConstantAssociatedConstByteGetter {
 		fn default_byte(&self) -> Vec<u8> {
-			<TestRuntime as system::Trait>::ASSOCIATED_CONST.encode()
+			<TestRuntime as system::Config>::ASSOCIATED_CONST.encode()
 		}
 	}
 
diff --git a/frame/support/src/origin.rs b/frame/support/src/origin.rs
index b96a56c8e1d8f..980ab902a389d 100644
--- a/frame/support/src/origin.rs
+++ b/frame/support/src/origin.rs
@@ -181,12 +181,12 @@ macro_rules! impl_outer_origin {
 			index { $( $index:tt )? },
 		)*
 	) => {
-		// WARNING: All instance must hold the filter `frame_system::Trait::BaseCallFilter`, except
+		// WARNING: All instance must hold the filter `frame_system::Config::BaseCallFilter`, except
 		// when caller is system Root. One can use `OriginTrait::reset_filter` to do so.
 		#[derive(Clone)]
 		pub struct $name {
 			caller: $caller_name,
-			filter: $crate::sp_std::rc::Rc<Box<dyn Fn(&<$runtime as $system::Trait>::Call) -> bool>>,
+			filter: $crate::sp_std::rc::Rc<Box<dyn Fn(&<$runtime as $system::Config>::Call) -> bool>>,
 		}
 
 		#[cfg(not(feature = "std"))]
@@ -213,9 +213,9 @@ macro_rules! impl_outer_origin {
 		}
 
 		impl $crate::traits::OriginTrait for $name {
-			type Call = <$runtime as $system::Trait>::Call;
+			type Call = <$runtime as $system::Config>::Call;
 			type PalletsOrigin = $caller_name;
-			type AccountId = <$runtime as $system::Trait>::AccountId;
+			type AccountId = <$runtime as $system::Config>::AccountId;
 
 			fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) {
 				let f = self.filter.clone();
@@ -227,8 +227,8 @@ macro_rules! impl_outer_origin {
 
 			fn reset_filter(&mut self) {
 				let filter = <
-					<$runtime as $system::Trait>::BaseCallFilter
-					as $crate::traits::Filter<<$runtime as $system::Trait>::Call>
+					<$runtime as $system::Config>::BaseCallFilter
+					as $crate::traits::Filter<<$runtime as $system::Config>::Call>
 				>::filter;
 
 				self.filter = $crate::sp_std::rc::Rc::new(Box::new(filter));
@@ -246,7 +246,7 @@ macro_rules! impl_outer_origin {
 				&self.caller
 			}
 
-			/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
+			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 			fn none() -> Self {
 				$system::RawOrigin::None.into()
 			}
@@ -254,8 +254,8 @@ macro_rules! impl_outer_origin {
 			fn root() -> Self {
 				$system::RawOrigin::Root.into()
 			}
-			/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
-			fn signed(by: <$runtime as $system::Trait>::AccountId) -> Self {
+			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+			fn signed(by: <$runtime as $system::Config>::AccountId) -> Self {
 				$system::RawOrigin::Signed(by).into()
 			}
 		}
@@ -280,7 +280,7 @@ macro_rules! impl_outer_origin {
 		// For backwards compatibility and ease of accessing these functions.
 		#[allow(dead_code)]
 		impl $name {
-			/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
+			/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 			pub fn none() -> Self {
 				<$name as $crate::traits::OriginTrait>::none()
 			}
@@ -288,8 +288,8 @@ macro_rules! impl_outer_origin {
 			pub fn root() -> Self {
 				<$name as $crate::traits::OriginTrait>::root()
 			}
-			/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
-			pub fn signed(by: <$runtime as $system::Trait>::AccountId) -> Self {
+			/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
+			pub fn signed(by: <$runtime as $system::Config>::AccountId) -> Self {
 				<$name as $crate::traits::OriginTrait>::signed(by)
 			}
 		}
@@ -302,7 +302,7 @@ macro_rules! impl_outer_origin {
 		impl From<$system::Origin<$runtime>> for $name {
 			/// Convert to runtime origin:
 			/// * root origin is built with no filter
-			/// * others use `frame-system::Trait::BaseCallFilter`
+			/// * others use `frame-system::Config::BaseCallFilter`
 			fn from(x: $system::Origin<$runtime>) -> Self {
 				let o: $caller_name = x.into();
 				o.into()
@@ -335,10 +335,10 @@ macro_rules! impl_outer_origin {
 				}
 			}
 		}
-		impl From<Option<<$runtime as $system::Trait>::AccountId>> for $name {
+		impl From<Option<<$runtime as $system::Config>::AccountId>> for $name {
 			/// Convert to runtime origin with caller being system signed or none and use filter
-			/// `frame-system::Trait::BaseCallFilter`.
-			fn from(x: Option<<$runtime as $system::Trait>::AccountId>) -> Self {
+			/// `frame-system::Config::BaseCallFilter`.
+			fn from(x: Option<<$runtime as $system::Config>::AccountId>) -> Self {
 				<$system::Origin<$runtime>>::from(x).into()
 			}
 		}
@@ -352,7 +352,7 @@ macro_rules! impl_outer_origin {
 				}
 
 				impl From<$module::Origin < $( $generic )? $(, $module::$generic_instance )? > > for $name {
-					/// Convert to runtime origin using `frame-system::Trait::BaseCallFilter`.
+					/// Convert to runtime origin using `frame-system::Config::BaseCallFilter`.
 					fn from(x: $module::Origin < $( $generic )? $(, $module::$generic_instance )? >) -> Self {
 						let x: $caller_name = x.into();
 						x.into()
@@ -388,7 +388,7 @@ mod tests {
 	mod frame_system {
 		use super::*;
 
-		pub trait Trait {
+		pub trait Config {
 			type AccountId;
 			type Call;
 			type BaseCallFilter;
@@ -410,7 +410,7 @@ mod tests {
 			}
 		}
 
-		pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+		pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 	}
 
 	mod origin_without_generic {
@@ -439,7 +439,7 @@ mod tests {
 		}
 	}
 
-	impl frame_system::Trait for TestRuntime {
+	impl frame_system::Config for TestRuntime {
 		type AccountId = u32;
 		type Call = u32;
 		type BaseCallFilter = BaseCallFilter;
diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs
index cbc62c83de886..6fb3abca5ca7f 100644
--- a/frame/support/src/storage/generator/double_map.rs
+++ b/frame/support/src/storage/generator/double_map.rs
@@ -425,7 +425,7 @@ mod test_iterators {
 		storage::{generator::StorageDoubleMap, IterableStorageDoubleMap, unhashed},
 	};
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type BlockNumber;
 		type PalletInfo: crate::traits::PalletInfo;
@@ -433,14 +433,14 @@ mod test_iterators {
 	}
 
 	crate::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
 	struct NoDef(u32);
 
 	crate::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			DoubleMap: double_map hasher(blake2_128_concat) u16, hasher(twox_64_concat) u32 => u64;
 		}
 	}
diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs
index 601fd4c4a8dd2..2c2390865d02f 100644
--- a/frame/support/src/storage/generator/map.rs
+++ b/frame/support/src/storage/generator/map.rs
@@ -325,7 +325,7 @@ mod test_iterators {
 		storage::{generator::StorageMap, IterableStorageMap, unhashed},
 	};
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type BlockNumber;
 		type PalletInfo: crate::traits::PalletInfo;
@@ -333,14 +333,14 @@ mod test_iterators {
 	}
 
 	crate::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
 	struct NoDef(u32);
 
 	crate::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			Map: map hasher(blake2_128_concat) u16 => u64;
 		}
 	}
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 9346718f63481..4b444ce074f00 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -42,14 +42,14 @@ mod tests {
 
 	struct Runtime;
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type BlockNumber;
 		type PalletInfo: crate::traits::PalletInfo;
 		type DbWeight: crate::traits::Get<crate::weights::RuntimeDbWeight>;
 	}
 
-	impl Trait for Runtime {
+	impl Config for Runtime {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
@@ -57,11 +57,11 @@ mod tests {
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 	}
 
 	crate::decl_storage! {
-		trait Store for Module<T: Trait> as Runtime {
+		trait Store for Module<T: Config> as Runtime {
 			Value get(fn value) config(): (u64, u64);
 			NumberMap: map hasher(identity) u32 => u64;
 			DoubleMap: double_map hasher(identity) u32, hasher(identity) u32 => u64;
diff --git a/frame/support/src/traits.rs b/frame/support/src/traits.rs
index b40ebe3dba67c..19c23a464db02 100644
--- a/frame/support/src/traits.rs
+++ b/frame/support/src/traits.rs
@@ -1653,16 +1653,16 @@ pub trait EnsureOrigin<OuterOrigin> {
 /// Implemented for pallet dispatchable type by `decl_module` and for runtime dispatchable by
 /// `construct_runtime` and `impl_outer_dispatch`.
 pub trait UnfilteredDispatchable {
-	/// The origin type of the runtime, (i.e. `frame_system::Trait::Origin`).
+	/// The origin type of the runtime, (i.e. `frame_system::Config::Origin`).
 	type Origin;
 
 	/// Dispatch this call but do not check the filter in origin.
 	fn dispatch_bypass_filter(self, origin: Self::Origin) -> crate::dispatch::DispatchResultWithPostInfo;
 }
 
-/// Methods available on `frame_system::Trait::Origin`.
+/// Methods available on `frame_system::Config::Origin`.
 pub trait OriginTrait: Sized {
-	/// Runtime call type, as in `frame_system::Trait::Call`
+	/// Runtime call type, as in `frame_system::Config::Call`
 	type Call;
 
 	/// The caller origin, overarching type of all pallets origins.
@@ -1674,7 +1674,7 @@ pub trait OriginTrait: Sized {
 	/// Add a filter to the origin.
 	fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static);
 
-	/// Reset origin filters to default one, i.e `frame_system::Trait::BaseCallFilter`.
+	/// Reset origin filters to default one, i.e `frame_system::Config::BaseCallFilter`.
 	fn reset_filter(&mut self);
 
 	/// Replace the caller with caller from the other origin
@@ -1686,13 +1686,13 @@ pub trait OriginTrait: Sized {
 	/// Get the caller.
 	fn caller(&self) -> &Self::PalletsOrigin;
 
-	/// Create with system none origin and `frame-system::Trait::BaseCallFilter`.
+	/// Create with system none origin and `frame-system::Config::BaseCallFilter`.
 	fn none() -> Self;
 
 	/// Create with system root origin and no filter.
 	fn root() -> Self;
 
-	/// Create with system signed origin and `frame-system::Trait::BaseCallFilter`.
+	/// Create with system signed origin and `frame-system::Config::BaseCallFilter`.
 	fn signed(by: Self::AccountId) -> Self;
 }
 
diff --git a/frame/support/src/weights.rs b/frame/support/src/weights.rs
index 74f0773aa541f..6a62befd6d5c8 100644
--- a/frame/support/src/weights.rs
+++ b/frame/support/src/weights.rs
@@ -39,9 +39,9 @@
 //!    `Yes`**.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = 1000]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -52,10 +52,10 @@
 //! 2.1 Define weight and class, **in which case `PaysFee` would be `Yes`**.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::DispatchClass;
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = (1000, DispatchClass::Operational)]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -66,10 +66,10 @@
 //! 2.2 Define weight and `PaysFee`, **in which case `ClassifyDispatch` would be `Normal`**.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::Pays;
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = (1000, Pays::No)]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -80,10 +80,10 @@
 //! 3. Define all 3 parameters.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::{DispatchClass, Pays};
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = (1000, DispatchClass::Operational, Pays::No)]
 //!         fn dispatching(origin) { unimplemented!() }
 //!     }
@@ -100,10 +100,10 @@
 //! all 3 are static values, providing a raw tuple is easier.
 //!
 //! ```
-//! # use frame_system::Trait;
+//! # use frame_system::Config;
 //! # use frame_support::weights::{DispatchClass, FunctionOf, Pays};
 //! frame_support::decl_module! {
-//!     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//!     pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //!         #[weight = FunctionOf(
 //! 			// weight, function.
 //! 			|args: (&u32, &u64)| *args.0 as u64 + args.1,
@@ -701,7 +701,7 @@ mod tests {
 	use crate::{decl_module, parameter_types, traits::Get};
 	use super::*;
 
-	pub trait Trait: 'static {
+	pub trait Config: 'static {
 		type Origin;
 		type Balance;
 		type BlockNumber;
@@ -718,7 +718,7 @@ mod tests {
 		};
 	}
 
-	impl Trait for TraitImpl {
+	impl Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type Balance = u32;
@@ -727,7 +727,7 @@ mod tests {
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 			// no arguments, fixed weight
 			#[weight = 1000]
 			fn f00(_origin) { unimplemented!(); }
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index ee8ace5c983c5..6d8064102c4dd 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -25,6 +25,7 @@ trybuild = "1.0.33"
 pretty_assertions = "0.6.1"
 rustversion = "1.0.0"
 frame-metadata = { version = "12.0.0", default-features = false, path = "../../metadata" }
+frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
 
 [features]
 default = ["std"]
@@ -33,6 +34,7 @@ std = [
 	"codec/std",
 	"sp-io/std",
 	"frame-support/std",
+	"frame-system/std",
 	"sp-inherents/std",
 	"sp-core/std",
 	"sp-std/std",
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index a917c781c065c..2baf698f1e529 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -26,7 +26,7 @@
 mod pallet_version;
 
 /// The configuration trait
-pub trait Trait: 'static {
+pub trait Config: 'static {
 	/// The runtime origin type.
 	type Origin: codec::Codec + codec::EncodeLike + Default;
 	/// The block number type.
@@ -39,5 +39,5 @@ pub trait Trait: 'static {
 
 frame_support::decl_module! {
 	/// Some test module
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {}
 }
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 4ff4fc6828604..33bb4a9cc877b 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -37,11 +37,11 @@ thread_local! {
 mod module1 {
 	use super::*;
 
-	pub trait Trait<I>: system::Trait {}
+	pub trait Config<I>: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance = DefaultInstance> for enum Call
-			where origin: <T as system::Trait>::Origin, system=system
+		pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call
+			where origin: <T as system::Config>::Origin, system=system
 		{
 			#[weight = 0]
 			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
@@ -55,31 +55,31 @@ mod module1 {
 
 	frame_support::decl_event! {
 		pub enum Event<T, I: Instance = DefaultInstance> where
-			<T as system::Trait>::AccountId
+			<T as system::Config>::AccountId
 		{
 			A(AccountId),
 		}
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait<I>, I: Instance> {
+		pub enum Error for Module<T: Config<I>, I: Instance> {
 			Something
 		}
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module {}
+		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module {}
 	}
 }
 
 mod module2 {
 	use super::*;
 
-	pub trait Trait: system::Trait {}
+	pub trait Config: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call
-			where origin: <T as system::Trait>::Origin, system=system
+		pub struct Module<T: Config> for enum Call
+			where origin: <T as system::Config>::Origin, system=system
 		{
 			#[weight = 0]
 			pub fn fail(_origin) -> frame_support::dispatch::DispatchResult {
@@ -102,25 +102,25 @@ mod module2 {
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait> {
+		pub enum Error for Module<T: Config> {
 			Something
 		}
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Module {}
+		trait Store for Module<T: Config> as Module {}
 	}
 }
 
-impl<I> module1::Trait<I> for Runtime {}
-impl module2::Trait for Runtime {}
+impl<I> module1::Config<I> for Runtime {}
+impl module2::Config for Runtime {}
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Hash = H256;
 	type Origin = Origin;
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs
index 56eff29c5dc1b..cc7c1ff219d8b 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.rs
@@ -1,5 +1,5 @@
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		fn integrity_test() {}
 
 		fn integrity_test() {}
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr
index 25f3b891d9b47..3bf5f58b43a39 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_integrity_test.stderr
@@ -2,7 +2,7 @@ error: `integrity_test` can only be passed once as input.
  --> $DIR/reserved_keyword_two_times_integrity_test.rs:1:1
   |
 1 | / frame_support::decl_module! {
-2 | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2 | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3 | |         fn integrity_test() {}
 4 | |
 5 | |         fn integrity_test() {}
@@ -16,7 +16,7 @@ error[E0601]: `main` function not found in crate `$CRATE`
  --> $DIR/reserved_keyword_two_times_integrity_test.rs:1:1
   |
 1 | / frame_support::decl_module! {
-2 | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2 | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3 | |         fn integrity_test() {}
 4 | |
 5 | |         fn integrity_test() {}
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs
index 3e1bc25c8d59c..ddde7c72c1cc5 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.rs
@@ -1,5 +1,5 @@
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		fn on_initialize() -> Weight {
 			0
 		}
diff --git a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr
index 34c5ff3f941a1..2911d7ded8a23 100644
--- a/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr
+++ b/frame/support/test/tests/decl_module_ui/reserved_keyword_two_times_on_initialize.stderr
@@ -2,7 +2,7 @@ error: `on_initialize` can only be passed once as input.
   --> $DIR/reserved_keyword_two_times_on_initialize.rs:1:1
    |
 1  | / frame_support::decl_module! {
-2  | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2  | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3  | |         fn on_initialize() -> Weight {
 4  | |             0
 ...  |
@@ -16,7 +16,7 @@ error[E0601]: `main` function not found in crate `$CRATE`
   --> $DIR/reserved_keyword_two_times_on_initialize.rs:1:1
    |
 1  | / frame_support::decl_module! {
-2  | |     pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+2  | |     pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 3  | |         fn on_initialize() -> Weight {
 4  | |             0
 ...  |
diff --git a/frame/support/test/tests/decl_storage.rs b/frame/support/test/tests/decl_storage.rs
index 8d5727ce9104b..97cf68c799b2a 100644
--- a/frame/support/test/tests/decl_storage.rs
+++ b/frame/support/test/tests/decl_storage.rs
@@ -24,13 +24,13 @@ mod tests {
 	use std::marker::PhantomData;
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as TestStorage {
+		trait Store for Module<T: Config> as TestStorage {
 			// non-getters: pub / $default
 
 			/// Hello, this is doc!
@@ -81,14 +81,14 @@ mod tests {
 
 	struct TraitImpl {}
 
-	impl frame_support_test::Trait for TraitImpl {
+	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for TraitImpl {}
+	impl Config for TraitImpl {}
 
 	const EXPECTED_METADATA: StorageMetadata = StorageMetadata {
 		prefix: DecodeDifferent::Encode("TestStorage"),
@@ -414,16 +414,16 @@ mod tests {
 #[cfg(test)]
 #[allow(dead_code)]
 mod test2 {
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	type PairOf<T> = (T, T);
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as TestStorage {
+		trait Store for Module<T: Config> as TestStorage {
 			SingleDef : u32;
 			PairDef : PairOf<u32>;
 			Single : Option<u32>;
@@ -438,26 +438,26 @@ mod test2 {
 
 	struct TraitImpl {}
 
-	impl frame_support_test::Trait for TraitImpl {
+	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for TraitImpl {}
+	impl Config for TraitImpl {}
 }
 
 #[cfg(test)]
 #[allow(dead_code)]
 mod test3 {
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			Foo get(fn foo) config(initial_foo): u32;
 		}
 	}
@@ -466,14 +466,14 @@ mod test3 {
 
 	struct TraitImpl {}
 
-	impl frame_support_test::Trait for TraitImpl {
+	impl frame_support_test::Config for TraitImpl {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for TraitImpl {}
+	impl Config for TraitImpl {}
 }
 
 #[cfg(test)]
@@ -482,17 +482,17 @@ mod test_append_and_len {
 	use sp_io::TestExternalities;
 	use codec::{Encode, Decode};
 
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	#[derive(PartialEq, Eq, Clone, Encode, Decode)]
 	struct NoDef(u32);
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Test {
+		trait Store for Module<T: Config> as Test {
 			NoDefault: Option<NoDef>;
 
 			JustVec: Vec<u32>;
@@ -511,14 +511,14 @@ mod test_append_and_len {
 
 	struct Test {}
 
-	impl frame_support_test::Trait for Test {
+	impl frame_support_test::Config for Test {
 		type Origin = u32;
 		type BlockNumber = u32;
 		type PalletInfo = ();
 		type DbWeight = ();
 	}
 
-	impl Trait for Test {}
+	impl Config for Test {}
 
 	#[test]
 	fn default_for_option() {
diff --git a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
index 58923ed19297c..c7de52dd8935b 100644
--- a/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_duplicate.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as FinalKeysNone {
+	trait Store for Module<T: Config> as FinalKeysNone {
 		pub Value config(value): u32;
 		pub Value2 config(value): u32;
 	}
diff --git a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
index e77dcea404ccb..60bfa7f89c36f 100644
--- a/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/config_get_duplicate.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as FinalKeysNone {
+	trait Store for Module<T: Config> as FinalKeysNone {
 		pub Value get(fn value) config(): u32;
 		pub Value2 config(value): u32;
 	}
diff --git a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
index b6ccb7ebb7b7b..921dfa6b774dd 100644
--- a/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
+++ b/frame/support/test/tests/decl_storage_ui/get_duplicate.rs
@@ -15,14 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as FinalKeysNone {
+	trait Store for Module<T: Config> as FinalKeysNone {
 		pub Value get(fn value) config(): u32;
 		pub Value2 get(fn value) config(): u32;
 	}
diff --git a/frame/support/test/tests/derive_no_bound.rs b/frame/support/test/tests/derive_no_bound.rs
index 29f813c6498bb..48f2f3ec3f6be 100644
--- a/frame/support/test/tests/derive_no_bound.rs
+++ b/frame/support/test/tests/derive_no_bound.rs
@@ -28,19 +28,19 @@ fn runtime_debug_no_bound_display_correctly() {
 	assert_eq!(format!("{:?}", Unnamed(1)), "Unnamed(1)");
 }
 
-trait Trait {
+trait Config {
 	type C: std::fmt::Debug + Clone + Eq + PartialEq;
 }
 
 struct Runtime;
 struct ImplNone;
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type C = u32;
 }
 
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
-struct StructNamed<T: Trait, U, V> {
+struct StructNamed<T: Config, U, V> {
 	a: u32,
 	b: u64,
 	c: T::C,
@@ -77,7 +77,7 @@ fn test_struct_named() {
 }
 
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
-struct StructUnnamed<T: Trait, U, V>(u32, u64, T::C, core::marker::PhantomData<(U, V)>);
+struct StructUnnamed<T: Config, U, V>(u32, u64, T::C, core::marker::PhantomData<(U, V)>);
 
 #[test]
 fn test_struct_unnamed() {
@@ -109,7 +109,7 @@ fn test_struct_unnamed() {
 }
 
 #[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound)]
-enum Enum<T: Trait, U, V> {
+enum Enum<T: Config, U, V> {
 	VariantUnnamed(u32, u64, T::C, core::marker::PhantomData<(U, V)>),
 	VariantNamed {
 		a: u32,
diff --git a/frame/support/test/tests/derive_no_bound_ui/clone.rs b/frame/support/test/tests/derive_no_bound_ui/clone.rs
index 6b80dcedc3880..2bc1cc492d171 100644
--- a/frame/support/test/tests/derive_no_bound_ui/clone.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/clone.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::CloneNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/clone.stderr b/frame/support/test/tests/derive_no_bound_ui/clone.stderr
index 4b9cccf0b0fa1..af322f386aec4 100644
--- a/frame/support/test/tests/derive_no_bound_ui/clone.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/clone.stderr
@@ -1,7 +1,7 @@
-error[E0277]: the trait bound `<T as Trait>::C: std::clone::Clone` is not satisfied
+error[E0277]: the trait bound `<T as Config>::C: std::clone::Clone` is not satisfied
  --> $DIR/clone.rs:7:2
   |
 7 |     c: T::C,
-  |     ^ the trait `std::clone::Clone` is not implemented for `<T as Trait>::C`
+  |     ^ the trait `std::clone::Clone` is not implemented for `<T as Config>::C`
   |
   = note: required by `std::clone::Clone::clone`
diff --git a/frame/support/test/tests/derive_no_bound_ui/debug.rs b/frame/support/test/tests/derive_no_bound_ui/debug.rs
index f2411da4b41bc..6016c3e6d98b8 100644
--- a/frame/support/test/tests/derive_no_bound_ui/debug.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/debug.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::DebugNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/debug.stderr b/frame/support/test/tests/derive_no_bound_ui/debug.stderr
index 838bd7f68a65f..7580cab2ea0b3 100644
--- a/frame/support/test/tests/derive_no_bound_ui/debug.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/debug.stderr
@@ -1,8 +1,8 @@
-error[E0277]: `<T as Trait>::C` doesn't implement `std::fmt::Debug`
+error[E0277]: `<T as Config>::C` doesn't implement `std::fmt::Debug`
  --> $DIR/debug.rs:7:2
   |
 7 |     c: T::C,
-  |     ^ `<T as Trait>::C` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+  |     ^ `<T as Config>::C` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
   |
-  = help: the trait `std::fmt::Debug` is not implemented for `<T as Trait>::C`
+  = help: the trait `std::fmt::Debug` is not implemented for `<T as Config>::C`
   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.rs b/frame/support/test/tests/derive_no_bound_ui/eq.rs
index 9e4026734fbeb..a48452626368c 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::EqNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index 08341c4d65ab5..bd5df600dc428 100644
--- a/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -1,7 +1,7 @@
 error[E0277]: can't compare `Foo<T>` with `Foo<T>`
    --> $DIR/eq.rs:6:8
     |
-6   | struct Foo<T: Trait> {
+6   | struct Foo<T: Config> {
     |        ^^^ no implementation for `Foo<T> == Foo<T>`
     |
     = help: the trait `std::cmp::PartialEq` is not implemented for `Foo<T>`
diff --git a/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs b/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
index 1720776a40029..7bd6b7ef6a2e3 100644
--- a/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
+++ b/frame/support/test/tests/derive_no_bound_ui/partial_eq.rs
@@ -1,9 +1,9 @@
-trait Trait {
+trait Config {
 	type C;
 }
 
 #[derive(frame_support::PartialEqNoBound)]
-struct Foo<T: Trait> {
+struct Foo<T: Config> {
 	c: T::C,
 }
 
diff --git a/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr b/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
index d85757c520aa1..64f844e547be0 100644
--- a/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
+++ b/frame/support/test/tests/derive_no_bound_ui/partial_eq.stderr
@@ -1,7 +1,7 @@
-error[E0369]: binary operation `==` cannot be applied to type `<T as Trait>::C`
+error[E0369]: binary operation `==` cannot be applied to type `<T as Config>::C`
  --> $DIR/partial_eq.rs:7:2
   |
 7 |     c: T::C,
   |     ^
   |
-  = note: the trait `std::cmp::PartialEq` is not implemented for `<T as Trait>::C`
+  = note: the trait `std::cmp::PartialEq` is not implemented for `<T as Config>::C`
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
index 6bd1252825466..e7c95c6b432a4 100644
--- a/frame/support/test/tests/final_keys.rs
+++ b/frame/support/test/tests/final_keys.rs
@@ -21,14 +21,14 @@ use frame_support::{StorageDoubleMap, StorageMap, StorageValue, StoragePrefixedM
 use sp_io::{TestExternalities, hashing::{twox_64, twox_128, blake2_128}};
 
 mod no_instance {
-	pub trait Trait: frame_support_test::Trait {}
+	pub trait Config: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	frame_support::decl_storage!{
-		trait Store for Module<T: Trait> as FinalKeysNone {
+		trait Store for Module<T: Config> as FinalKeysNone {
 			pub Value config(value): u32;
 
 			pub Map: map hasher(blake2_128_concat) u32 => u32;
@@ -45,15 +45,15 @@ mod no_instance {
 }
 
 mod instance {
-	pub trait Trait<I = DefaultInstance>: frame_support_test::Trait {}
+	pub trait Config<I = DefaultInstance>: frame_support_test::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance = DefaultInstance>
+		pub struct Module<T: Config<I>, I: Instance = DefaultInstance>
 			for enum Call where origin: T::Origin, system=frame_support_test {}
 	}
 
 	frame_support::decl_storage!{
-		trait Store for Module<T: Trait<I>, I: Instance = DefaultInstance>
+		trait Store for Module<T: Config<I>, I: Instance = DefaultInstance>
 			as FinalKeysSome
 		{
 			pub Value config(value): u32;
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index f268f11a4dc15..4a875bb688909 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -15,28 +15,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {}
 }
 
 frame_support::decl_storage! {
-	trait Store for Module<T: Trait> as Test {
+	trait Store for Module<T: Config> as Test {
 		pub AppendableDM config(t): double_map hasher(identity) u32, hasher(identity) T::BlockNumber => Vec<u32>;
 	}
 }
 
 struct Test;
 
-impl frame_support_test::Trait for Test {
+impl frame_support_test::Config for Test {
 	type BlockNumber = u32;
 	type Origin = ();
 	type PalletInfo = ();
 	type DbWeight = ();
 }
 
-impl Trait for Test {}
+impl Config for Test {}
 
 #[test]
 fn init_genesis_config() {
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 6c90767f92e57..b5bb6dd671b97 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -41,16 +41,16 @@ mod module1 {
 	use super::*;
 	use sp_std::ops::Add;
 
-	pub trait Trait<I>: system::Trait where <Self as system::Trait>::BlockNumber: From<u32> {
-		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+	pub trait Config<I>: system::Config where <Self as system::Config>::BlockNumber: From<u32> {
+		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
 		type SomeParameter: Get<u32>;
 		type GenericType: Default + Clone + Codec + EncodeLike;
 	}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config<I>, I: Instance> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system,
 			T::BlockNumber: From<u32>
 		{
@@ -67,7 +67,7 @@ mod module1 {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance> as Module1 where
+		trait Store for Module<T: Config<I>, I: Instance> as Module1 where
 			T::BlockNumber: From<u32> + std::fmt::Display
 		{
 			pub Value config(value): T::GenericType;
@@ -83,7 +83,7 @@ mod module1 {
 	}
 
 	frame_support::decl_error! {
-		pub enum Error for Module<T: Trait<I>, I: Instance> where
+		pub enum Error for Module<T: Config<I>, I: Instance> where
 			T::BlockNumber: From<u32>,
 			T::BlockNumber: Add,
 			T::AccountId: AsRef<[u8]>,
@@ -101,14 +101,14 @@ mod module1 {
 	}
 
 	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
-	pub enum Origin<T: Trait<I>, I> where T::BlockNumber: From<u32> {
+	pub enum Origin<T: Config<I>, I> where T::BlockNumber: From<u32> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
 	}
 
 	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
 
-	impl<T: Trait<I>, I: Instance> ProvideInherent for Module<T, I> where
+	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I> where
 		T::BlockNumber: From<u32>
 	{
 		type Call = Call<T, I>;
@@ -131,17 +131,17 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Trait<I=DefaultInstance>: system::Trait {
+	pub trait Config<I=DefaultInstance>: system::Config {
 		type Amount: Parameter + Default;
-		type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
+		type Event: From<Event<Self, I>> + Into<<Self as system::Config>::Event>;
 		type Origin: From<Origin<Self, I>>;
 	}
 
-	impl<T: Trait<I>, I: Instance> Currency for Module<T, I> {}
+	impl<T: Config<I>, I: Instance> Currency for Module<T, I> {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system
 		{
 			fn deposit_event() = default;
@@ -149,7 +149,7 @@ mod module2 {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module2 {
+		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module2 {
 			pub Value config(value): T::Amount;
 			pub Map config(map): map hasher(identity) u64 => u64;
 			pub DoubleMap config(double_map): double_map hasher(identity) u64, hasher(identity) u64 => u64;
@@ -157,20 +157,20 @@ mod module2 {
 	}
 
 	frame_support::decl_event! {
-		pub enum Event<T, I=DefaultInstance> where Amount = <T as Trait<I>>::Amount {
+		pub enum Event<T, I=DefaultInstance> where Amount = <T as Config<I>>::Amount {
 			Variant(Amount),
 		}
 	}
 
 	#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug, Encode, Decode)]
-	pub enum Origin<T: Trait<I>, I=DefaultInstance> {
+	pub enum Origin<T: Config<I>, I=DefaultInstance> {
 		Members(u32),
 		_Phantom(std::marker::PhantomData<(T, I)>),
 	}
 
 	pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
 
-	impl<T: Trait<I>, I: Instance> ProvideInherent for Module<T, I> {
+	impl<T: Config<I>, I: Instance> ProvideInherent for Module<T, I> {
 		type Call = Call<T, I>;
 		type Error = MakeFatalError<sp_inherents::Error>;
 		const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -190,13 +190,13 @@ mod module2 {
 mod module3 {
 	use super::*;
 
-	pub trait Trait: module2::Trait + module2::Trait<module2::Instance1> + system::Trait {
+	pub trait Config: module2::Config + module2::Config<module2::Instance1> + system::Config {
 		type Currency: Currency;
 		type Currency2: Currency;
 	}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin, system=system {}
+		pub struct Module<T: Config> for enum Call where origin: <T as system::Config>::Origin, system=system {}
 	}
 }
 
@@ -204,39 +204,39 @@ parameter_types! {
 	pub const SomeValue: u32 = 100;
 }
 
-impl module1::Trait<module1::Instance1> for Runtime {
+impl module1::Config<module1::Instance1> for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type SomeParameter = SomeValue;
 	type GenericType = u32;
 }
-impl module1::Trait<module1::Instance2> for Runtime {
+impl module1::Config<module1::Instance2> for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type SomeParameter = SomeValue;
 	type GenericType = u32;
 }
-impl module2::Trait for Runtime {
+impl module2::Config for Runtime {
 	type Amount = u16;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module2::Trait<module2::Instance1> for Runtime {
+impl module2::Config<module2::Instance1> for Runtime {
 	type Amount = u32;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module2::Trait<module2::Instance2> for Runtime {
+impl module2::Config<module2::Instance2> for Runtime {
 	type Amount = u32;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module2::Trait<module2::Instance3> for Runtime {
+impl module2::Config<module2::Instance3> for Runtime {
 	type Amount = u64;
 	type Event = Event;
 	type Origin = Origin;
 }
-impl module3::Trait for Runtime {
+impl module3::Config for Runtime {
 	type Currency = Module2_2;
 	type Currency2 = Module2_3;
 }
@@ -246,7 +246,7 @@ pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter= ();
 	type Hash = H256;
 	type Origin = Origin;
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 596a3b6ffb25d..70a84dfee59de 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -27,9 +27,9 @@ mod module {
 	use super::*;
 
 	pub type Request<T> = (
-		<T as system::Trait>::AccountId,
+		<T as system::Config>::AccountId,
 		Role,
-		<T as system::Trait>::BlockNumber,
+		<T as system::Config>::BlockNumber,
 	);
 	pub type Requests<T> = Vec<Request<T>>;
 
@@ -39,7 +39,7 @@ mod module {
 	}
 
 	#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)]
-	pub struct RoleParameters<T: Trait> {
+	pub struct RoleParameters<T: Config> {
 		// minimum actors to maintain - if role is unstaking
 		// and remaining actors would be less that this value - prevent or punish for unstaking
 		pub min_actors: u32,
@@ -65,7 +65,7 @@ mod module {
 		pub startup_grace_period: T::BlockNumber,
 	}
 
-	impl<T: Trait> Default for RoleParameters<T> {
+	impl<T: Config> Default for RoleParameters<T> {
 		fn default() -> Self {
 			Self {
 				max_actors: 10,
@@ -81,18 +81,18 @@ mod module {
 		}
 	}
 
-	pub trait Trait: system::Trait {}
+	pub trait Config: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=system {}
+		pub struct Module<T: Config> for enum Call where origin: T::Origin, system=system {}
 	}
 
 	#[derive(Encode, Decode, Copy, Clone, Serialize, Deserialize)]
-	pub struct Data<T: Trait> {
+	pub struct Data<T: Config> {
 		pub	data: T::BlockNumber,
 	}
 
-	impl<T: Trait> Default for Data<T> {
+	impl<T: Config> Default for Data<T> {
 		fn default() -> Self {
 			Self {
 				data: T::BlockNumber::default(),
@@ -101,7 +101,7 @@ mod module {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait> as Actors {
+		trait Store for Module<T: Config> as Actors {
 			/// requirements to enter and maintain status in roles
 			pub Parameters get(fn parameters) build(|config: &GenesisConfig| {
 				if config.enable_storage_role {
@@ -157,7 +157,7 @@ pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature, ()>;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Hash = H256;
 	type Origin = Origin;
@@ -169,7 +169,7 @@ impl system::Trait for Runtime {
 	type DbWeight = ();
 }
 
-impl module::Trait for Runtime {}
+impl module::Config for Runtime {}
 
 frame_support::construct_runtime!(
 	pub enum Runtime where
diff --git a/frame/support/test/tests/pallet_version.rs b/frame/support/test/tests/pallet_version.rs
index d6293ac6a308a..00750c6767216 100644
--- a/frame/support/test/tests/pallet_version.rs
+++ b/frame/support/test/tests/pallet_version.rs
@@ -37,11 +37,11 @@ const SOME_TEST_VERSION: PalletVersion = PalletVersion { major: 3000, minor: 30,
 mod module1 {
 	use super::*;
 
-	pub trait Trait: system::Trait {}
+	pub trait Config: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system,
 		{}
 	}
@@ -52,11 +52,11 @@ mod module1 {
 mod module2 {
 	use super::*;
 
-	pub trait Trait<I=DefaultInstance>: system::Trait {}
+	pub trait Config<I=DefaultInstance>: system::Config {}
 
 	frame_support::decl_module! {
-		pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where
-			origin: <T as system::Trait>::Origin,
+		pub struct Module<T: Config<I>, I: Instance=DefaultInstance> for enum Call where
+			origin: <T as system::Config>::Origin,
 			system = system
 		{
 			fn on_runtime_upgrade() -> Weight {
@@ -78,21 +78,21 @@ mod module2 {
 	}
 
 	frame_support::decl_storage! {
-		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module2 {}
+		trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Module2 {}
 	}
 }
 
-impl module1::Trait for Runtime {}
-impl module2::Trait for Runtime {}
-impl module2::Trait<module2::Instance1> for Runtime {}
-impl module2::Trait<module2::Instance2> for Runtime {}
+impl module1::Config for Runtime {}
+impl module2::Config for Runtime {}
+impl module2::Config<module2::Instance1> for Runtime {}
+impl module2::Config<module2::Instance2> for Runtime {}
 
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
 pub type Index = u64;
 
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter= ();
 	type Hash = H256;
 	type Origin = Origin;
diff --git a/frame/support/test/tests/pallet_with_name_trait_is_valid.rs b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
new file mode 100644
index 0000000000000..3bb5e0ce66799
--- /dev/null
+++ b/frame/support/test/tests/pallet_with_name_trait_is_valid.rs
@@ -0,0 +1,157 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub trait Trait: frame_system::Config {
+	type Balance: frame_support::dispatch::Parameter;
+	/// The overarching event type.
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+}
+
+frame_support::decl_storage! {
+	trait Store for Module<T: Trait> as Example {
+		Dummy get(fn dummy) config(): Option<u32>;
+	}
+}
+
+frame_support::decl_event!(
+	pub enum Event<T> where B = <T as Trait>::Balance {
+		Dummy(B),
+	}
+);
+
+frame_support::decl_error!(
+	pub enum Error for Module<T: Trait> {
+		Dummy,
+	}
+);
+
+frame_support::decl_module! {
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+		fn deposit_event() = default;
+		type Error = Error<T>;
+		const Foo: u32 = u32::max_value();
+
+		#[weight = 0]
+		fn accumulate_dummy(origin, increase_by: T::Balance) {
+			unimplemented!();
+		}
+
+		fn on_initialize(_n: T::BlockNumber) -> frame_support::weights::Weight {
+			0
+		}
+	}
+}
+
+impl<T: Trait> sp_runtime::traits::ValidateUnsigned for Module<T> {
+	type Call = Call<T>;
+
+	fn validate_unsigned(
+		_source: sp_runtime::transaction_validity::TransactionSource,
+		_call: &Self::Call,
+	) -> sp_runtime::transaction_validity::TransactionValidity {
+		unimplemented!();
+	}
+}
+
+pub const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = *b"12345678";
+
+impl<T: Trait> sp_inherents::ProvideInherent for Module<T> {
+	type Call = Call<T>;
+	type Error = sp_inherents::MakeFatalError<sp_inherents::Error>;
+	const INHERENT_IDENTIFIER: sp_inherents::InherentIdentifier = INHERENT_IDENTIFIER;
+
+	fn create_inherent(_data: &sp_inherents::InherentData) -> Option<Self::Call> {
+		unimplemented!();
+	}
+
+	fn check_inherent(_: &Self::Call, _: &sp_inherents::InherentData) -> std::result::Result<(), Self::Error> {
+		unimplemented!();
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use crate as pallet_test;
+
+	use frame_support::parameter_types;
+	use sp_runtime::traits::Block;
+
+	type SignedExtra = (
+		frame_system::CheckEra<Runtime>,
+		frame_system::CheckNonce<Runtime>,
+		frame_system::CheckWeight<Runtime>,
+	);
+	type TestBlock = sp_runtime::generic::Block<TestHeader, TestUncheckedExtrinsic>;
+	type TestHeader = sp_runtime::generic::Header<u64, sp_runtime::traits::BlakeTwo256>;
+	type TestUncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<
+		<Runtime as frame_system::Config>::AccountId,
+		<Runtime as frame_system::Config>::Call,
+		(),
+		SignedExtra,
+	>;
+
+	frame_support::construct_runtime!(
+		pub enum Runtime where
+			Block = TestBlock,
+			NodeBlock = TestBlock,
+			UncheckedExtrinsic = TestUncheckedExtrinsic
+		{
+			System: frame_system::{Module, Call, Config, Storage, Event<T>},
+			PalletTest: pallet_test::{Module, Call, Storage, Event<T>, Config, ValidateUnsigned, Inherent},
+		}
+	);
+
+	parameter_types! {
+		pub const BlockHashCount: u64 = 250;
+		pub const MaximumBlockWeight: frame_support::weights::Weight = 1024;
+		pub const MaximumBlockLength: u32 = 2 * 1024;
+		pub const AvailableBlockRatio: sp_runtime::Perbill = sp_runtime::Perbill::one();
+	}
+
+	impl frame_system::Config for Runtime {
+		type BaseCallFilter = ();
+		type Origin = Origin;
+		type Index = u64;
+		type BlockNumber = u64;
+		type Hash = sp_core::H256;
+		type Call = Call;
+		type Hashing = sp_runtime::traits::BlakeTwo256;
+		type AccountId = u64;
+		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
+		type Header = TestHeader;
+		type Event = ();
+		type BlockHashCount = BlockHashCount;
+		type MaximumBlockWeight = MaximumBlockWeight;
+		type DbWeight = ();
+		type BlockExecutionWeight = ();
+		type ExtrinsicBaseWeight = ();
+		type MaximumExtrinsicWeight = MaximumBlockWeight;
+		type MaximumBlockLength = MaximumBlockLength;
+		type AvailableBlockRatio = AvailableBlockRatio;
+		type Version = ();
+		type PalletInfo = ();
+		type AccountData = ();
+		type OnNewAccount = ();
+		type OnKilledAccount = ();
+		type SystemWeightInfo = ();
+	}
+
+	impl pallet_test::Trait for Runtime {
+		type Balance = u32;
+		type Event = ();
+	}
+}
diff --git a/frame/support/test/tests/reserved_keyword/on_initialize.rs b/frame/support/test/tests/reserved_keyword/on_initialize.rs
index 781b72bd04e8c..72d53abfb1034 100644
--- a/frame/support/test/tests/reserved_keyword/on_initialize.rs
+++ b/frame/support/test/tests/reserved_keyword/on_initialize.rs
@@ -4,7 +4,7 @@ macro_rules! reserved {
 			mod $reserved {
 				pub use frame_support::dispatch;
 
-				pub trait Trait: frame_support_test::Trait {}
+				pub trait Config: frame_support_test::Config {}
 
 				pub mod system {
 					use frame_support::dispatch;
@@ -15,7 +15,7 @@ macro_rules! reserved {
 				}
 
 				frame_support::decl_module! {
-					pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {
+					pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {
 						#[weight = 0]
 						fn $reserved(_origin) -> dispatch::DispatchResult { unreachable!() }
 					}
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index 5c687ef05005d..93b531a678d91 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -22,10 +22,10 @@ use frame_support::{
 use sp_io::TestExternalities;
 use sp_std::result;
 
-pub trait Trait: frame_support_test::Trait {}
+pub trait Config: frame_support_test::Config {}
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=frame_support_test {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=frame_support_test {
 		#[weight = 0]
 		#[transactional]
 		fn value_commits(_origin, v: u32) {
@@ -42,7 +42,7 @@ frame_support::decl_module! {
 }
 
 frame_support::decl_storage!{
-	trait Store for Module<T: Trait> as StorageTransactions {
+	trait Store for Module<T: Config> as StorageTransactions {
 		pub Value: u32;
 		pub Map: map hasher(twox_64_concat) String => u32;
 	}
@@ -50,14 +50,14 @@ frame_support::decl_storage!{
 
 struct Runtime;
 
-impl frame_support_test::Trait for Runtime {
+impl frame_support_test::Config for Runtime {
 	type Origin = u32;
 	type BlockNumber = u32;
 	type PalletInfo = ();
 	type DbWeight = ();
 }
 
-impl Trait for Runtime {}
+impl Config for Runtime {}
 
 #[test]
 fn storage_transaction_basic_commit() {
diff --git a/frame/support/test/tests/system.rs b/frame/support/test/tests/system.rs
index f30b6e4c2af9d..2021aa43f518d 100644
--- a/frame/support/test/tests/system.rs
+++ b/frame/support/test/tests/system.rs
@@ -19,7 +19,7 @@ use frame_support::{
 	codec::{Encode, Decode, EncodeLike}, traits::Get, weights::RuntimeDbWeight,
 };
 
-pub trait Trait: 'static + Eq + Clone {
+pub trait Config: 'static + Eq + Clone {
 	type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
 		+ From<RawOrigin<Self::AccountId>>;
 
@@ -34,18 +34,18 @@ pub trait Trait: 'static + Eq + Clone {
 }
 
 frame_support::decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		#[weight = 0]
 		fn noop(origin) {}
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	pub fn deposit_event(_event: impl Into<T::Event>) {}
 }
 
 frame_support::decl_event!(
-	pub enum Event<T> where BlockNumber = <T as Trait>::BlockNumber {
+	pub enum Event<T> where BlockNumber = <T as Config>::BlockNumber {
 		ExtrinsicSuccess,
 		ExtrinsicFailed,
 		Ignore(BlockNumber),
@@ -53,7 +53,7 @@ frame_support::decl_event!(
 );
 
 frame_support::decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Test error documentation
 		TestError,
 		/// Error documentation
@@ -79,7 +79,7 @@ impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
 	}
 }
 
-pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 
 #[allow(dead_code)]
 pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), &'static str>
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index 00c965136c0d0..bedb99b9f8941 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -24,12 +24,12 @@ use sp_runtime::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header
 mod module {
 	use super::*;
 
-	pub trait Trait: system::Trait {
-		type Event: From<Event> + Into<<Self as system::Trait>::Event>;
+	pub trait Config: system::Config {
+		type Event: From<Event> + Into<<Self as system::Config>::Event>;
 	}
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+		pub struct Module<T: Config> for enum Call where origin: T::Origin {
 			pub fn deposit_event() = default;
 		}
 	}
@@ -60,7 +60,7 @@ frame_support::parameter_types! {
 }
 #[derive(Clone, Eq, PartialEq)]
 pub struct Runtime;
-impl system::Trait for Runtime {
+impl system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -88,7 +88,7 @@ impl system::Trait for Runtime {
 	type SystemWeightInfo = ();
 }
 
-impl module::Trait for Runtime {
+impl module::Config for Runtime {
 	type Event = Event;
 }
 
diff --git a/frame/system/benchmarking/src/lib.rs b/frame/system/benchmarking/src/lib.rs
index b631d00e47c50..1f54375433693 100644
--- a/frame/system/benchmarking/src/lib.rs
+++ b/frame/system/benchmarking/src/lib.rs
@@ -31,8 +31,8 @@ use frame_system::{Module as System, Call, RawOrigin, DigestItemOf, AccountInfo}
 
 mod mock;
 
-pub struct Module<T: Trait>(System<T>);
-pub trait Trait: frame_system::Trait {}
+pub struct Module<T: Config>(System<T>);
+pub trait Config: frame_system::Config {}
 
 benchmarks! {
 	_ { }
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 33255d7b50e19..b6ebecc9bb0db 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -38,7 +38,7 @@ pub struct Call;
 
 impl Dispatchable for Call {
 	type Origin = ();
-	type Trait = ();
+	type Config = ();
 	type Info = DispatchInfo;
 	type PostInfo = PostDispatchInfo;
 	fn dispatch(self, _origin: Self::Origin)
@@ -50,7 +50,7 @@ impl Dispatchable for Call {
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = AccountIndex;
@@ -78,7 +78,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl crate::Trait for Test {}
+impl crate::Config for Test {}
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index d0a346519ca23..f60437887b1d9 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use sp_runtime::{
 	traits::{SignedExtension, Zero},
 	transaction_validity::TransactionValidityError,
@@ -24,9 +24,9 @@ use sp_runtime::{
 
 /// Genesis hash check to provide replay protection between different networks.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckGenesis<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckGenesis<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckGenesis")
@@ -38,16 +38,16 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckGenesis<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> CheckGenesis<T> {
+impl<T: Config + Send + Sync> CheckGenesis<T> {
 	/// Creates new `SignedExtension` to check genesis hash.
 	pub fn new() -> Self {
 		Self(sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckGenesis<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckGenesis<T> {
 	type AccountId = T::AccountId;
-	type Call = <T as Trait>::Call;
+	type Call = <T as Config>::Call;
 	type AdditionalSigned = T::Hash;
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckGenesis";
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index 7e3f65d0324d7..fbc37f527d81a 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::{Trait, Module, BlockHash};
+use crate::{Config, Module, BlockHash};
 use frame_support::StorageMap;
 use sp_runtime::{
 	generic::Era,
@@ -28,16 +28,16 @@ use sp_runtime::{
 
 /// Check for transaction mortality.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckMortality<T: Trait + Send + Sync>(Era, sp_std::marker::PhantomData<T>);
+pub struct CheckMortality<T: Config + Send + Sync>(Era, sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> CheckMortality<T> {
+impl<T: Config + Send + Sync> CheckMortality<T> {
 	/// utility constructor. Used only in client/factory code.
 	pub fn from(era: Era) -> Self {
 		Self(era, sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckMortality<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckMortality<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckMortality({:?})", self.0)
@@ -49,7 +49,7 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckMortality<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckMortality<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 	type AccountId = T::AccountId;
 	type Call = T::Call;
 	type AdditionalSigned = T::Hash;
diff --git a/frame/system/src/extensions/check_nonce.rs b/frame/system/src/extensions/check_nonce.rs
index e7316457aaffc..a1a310833cd3c 100644
--- a/frame/system/src/extensions/check_nonce.rs
+++ b/frame/system/src/extensions/check_nonce.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use codec::{Encode, Decode};
-use crate::Trait;
+use crate::Config;
 use frame_support::{
 	weights::DispatchInfo,
 	StorageMap,
@@ -35,16 +35,16 @@ use sp_std::vec;
 /// Note that this does not set any priority by default. Make sure that AT LEAST one of the signed
 /// extension sets some kind of priority upon validating transactions.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckNonce<T: Trait>(#[codec(compact)] T::Index);
+pub struct CheckNonce<T: Config>(#[codec(compact)] T::Index);
 
-impl<T: Trait> CheckNonce<T> {
+impl<T: Config> CheckNonce<T> {
 	/// utility constructor. Used only in client/factory code.
 	pub fn from(nonce: T::Index) -> Self {
 		Self(nonce)
 	}
 }
 
-impl<T: Trait> sp_std::fmt::Debug for CheckNonce<T> {
+impl<T: Config> sp_std::fmt::Debug for CheckNonce<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckNonce({})", self.0)
@@ -56,7 +56,7 @@ impl<T: Trait> sp_std::fmt::Debug for CheckNonce<T> {
 	}
 }
 
-impl<T: Trait> SignedExtension for CheckNonce<T> where
+impl<T: Config> SignedExtension for CheckNonce<T> where
 	T::Call: Dispatchable<Info=DispatchInfo>
 {
 	type AccountId = T::AccountId;
diff --git a/frame/system/src/extensions/check_spec_version.rs b/frame/system/src/extensions/check_spec_version.rs
index 8dc4d8d9ceddc..f4838ab354725 100644
--- a/frame/system/src/extensions/check_spec_version.rs
+++ b/frame/system/src/extensions/check_spec_version.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::SignedExtension,
@@ -24,9 +24,9 @@ use sp_runtime::{
 
 /// Ensure the runtime version registered in the transaction is the same as at present.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckSpecVersion<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckSpecVersion<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckSpecVersion")
@@ -38,16 +38,16 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckSpecVersion<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> CheckSpecVersion<T> {
+impl<T: Config + Send + Sync> CheckSpecVersion<T> {
 	/// Create new `SignedExtension` to check runtime version.
 	pub fn new() -> Self {
 		Self(sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckSpecVersion<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckSpecVersion<T> {
 	type AccountId = T::AccountId;
-	type Call = <T as Trait>::Call;
+	type Call = <T as Config>::Call;
 	type AdditionalSigned = u32;
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckSpecVersion";
diff --git a/frame/system/src/extensions/check_tx_version.rs b/frame/system/src/extensions/check_tx_version.rs
index ee6f3349365b9..5a1c8cc738610 100644
--- a/frame/system/src/extensions/check_tx_version.rs
+++ b/frame/system/src/extensions/check_tx_version.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::SignedExtension,
@@ -24,9 +24,9 @@ use sp_runtime::{
 
 /// Ensure the transaction version registered in the transaction is the same as at present.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct CheckTxVersion<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckTxVersion<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckTxVersion")
@@ -38,16 +38,16 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckTxVersion<T> {
 	}
 }
 
-impl<T: Trait + Send + Sync> CheckTxVersion<T> {
+impl<T: Config + Send + Sync> CheckTxVersion<T> {
 	/// Create new `SignedExtension` to check transaction version.
 	pub fn new() -> Self {
 		Self(sp_std::marker::PhantomData)
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckTxVersion<T> {
+impl<T: Config + Send + Sync> SignedExtension for CheckTxVersion<T> {
 	type AccountId = T::AccountId;
-	type Call = <T as Trait>::Call;
+	type Call = <T as Config>::Call;
 	type AdditionalSigned = u32;
 	type Pre = ();
 	const IDENTIFIER: &'static str = "CheckTxVersion";
diff --git a/frame/system/src/extensions/check_weight.rs b/frame/system/src/extensions/check_weight.rs
index 39439a3e2d8ce..6dfff865d45bb 100644
--- a/frame/system/src/extensions/check_weight.rs
+++ b/frame/system/src/extensions/check_weight.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Trait, Module};
+use crate::{Config, Module};
 use codec::{Encode, Decode};
 use sp_runtime::{
 	traits::{SignedExtension, DispatchInfoOf, Dispatchable, PostDispatchInfoOf, Printable},
@@ -33,9 +33,9 @@ use frame_support::{
 
 /// Block resource (weight) limit check.
 #[derive(Encode, Decode, Clone, Eq, PartialEq, Default)]
-pub struct CheckWeight<T: Trait + Send + Sync>(sp_std::marker::PhantomData<T>);
+pub struct CheckWeight<T: Config + Send + Sync>(sp_std::marker::PhantomData<T>);
 
-impl<T: Trait + Send + Sync> CheckWeight<T> where
+impl<T: Config + Send + Sync> CheckWeight<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
 {
 	/// Get the quota ratio of each dispatch class type. This indicates that all operational and mandatory
@@ -213,7 +213,7 @@ impl<T: Trait + Send + Sync> CheckWeight<T> where
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for CheckWeight<T> where
+impl<T: Config + Send + Sync> SignedExtension for CheckWeight<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>
 {
 	type AccountId = T::AccountId;
@@ -294,7 +294,7 @@ impl<T: Trait + Send + Sync> SignedExtension for CheckWeight<T> where
 	}
 }
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for CheckWeight<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckWeight<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "CheckWeight")
@@ -316,11 +316,11 @@ mod tests {
 	use frame_support::weights::{Weight, Pays};
 
 	fn normal_weight_limit() -> Weight {
-		<Test as Trait>::AvailableBlockRatio::get() * <Test as Trait>::MaximumBlockWeight::get()
+		<Test as Config>::AvailableBlockRatio::get() * <Test as Config>::MaximumBlockWeight::get()
 	}
 
 	fn normal_length_limit() -> u32 {
-		<Test as Trait>::AvailableBlockRatio::get() * <Test as Trait>::MaximumBlockLength::get()
+		<Test as Config>::AvailableBlockRatio::get() * <Test as Config>::MaximumBlockLength::get()
 	}
 
 	#[test]
@@ -341,7 +341,7 @@ mod tests {
 		check(|max, len| {
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(max, len));
 			assert_eq!(System::block_weight().total(), Weight::max_value());
-			assert!(System::block_weight().total() > <Test as Trait>::MaximumBlockWeight::get());
+			assert!(System::block_weight().total() > <Test as Config>::MaximumBlockWeight::get());
 		});
 		check(|max, len| {
 			assert_ok!(CheckWeight::<Test>::do_validate(max, len));
@@ -352,7 +352,7 @@ mod tests {
 	fn normal_extrinsic_limited_by_maximum_extrinsic_weight() {
 		new_test_ext().execute_with(|| {
 			let max = DispatchInfo {
-				weight: <Test as Trait>::MaximumExtrinsicWeight::get() + 1,
+				weight: <Test as Config>::MaximumExtrinsicWeight::get() + 1,
 				class: DispatchClass::Normal,
 				..Default::default()
 			};
@@ -370,9 +370,9 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let operational_limit = CheckWeight::<Test>::get_dispatch_limit_ratio(
 				DispatchClass::Operational
-			) * <Test as Trait>::MaximumBlockWeight::get();
-			let base_weight = <Test as Trait>::ExtrinsicBaseWeight::get();
-			let block_base = <Test as Trait>::BlockExecutionWeight::get();
+			) * <Test as Config>::MaximumBlockWeight::get();
+			let base_weight = <Test as Config>::ExtrinsicBaseWeight::get();
+			let block_base = <Test as Config>::BlockExecutionWeight::get();
 
 			let weight = operational_limit - base_weight - block_base;
 			let okay = DispatchInfo {
@@ -406,7 +406,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			System::register_extra_weight_unchecked(Weight::max_value(), DispatchClass::Normal);
 			assert_eq!(System::block_weight().total(), Weight::max_value());
-			assert!(System::block_weight().total() > <Test as Trait>::MaximumBlockWeight::get());
+			assert!(System::block_weight().total() > <Test as Config>::MaximumBlockWeight::get());
 		});
 	}
 
@@ -426,8 +426,8 @@ mod tests {
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
 			assert_eq!(System::block_weight().total(), 768);
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&rest_operational, len));
-			assert_eq!(<Test as Trait>::MaximumBlockWeight::get(), 1024);
-			assert_eq!(System::block_weight().total(), <Test as Trait>::MaximumBlockWeight::get());
+			assert_eq!(<Test as Config>::MaximumBlockWeight::get(), 1024);
+			assert_eq!(System::block_weight().total(), <Test as Config>::MaximumBlockWeight::get());
 			// Checking single extrinsic should not take current block weight into account.
 			assert_eq!(CheckWeight::<Test>::check_extrinsic_weight(&rest_operational), Ok(()));
 		});
@@ -446,8 +446,8 @@ mod tests {
 			// Extra 15 here from block execution + base extrinsic weight
 			assert_eq!(System::block_weight().total(), 266);
 			assert_ok!(CheckWeight::<Test>::do_pre_dispatch(&max_normal, len));
-			assert_eq!(<Test as Trait>::MaximumBlockWeight::get(), 1024);
-			assert_eq!(System::block_weight().total(), <Test as Trait>::MaximumBlockWeight::get());
+			assert_eq!(<Test as Config>::MaximumBlockWeight::get(), 1024);
+			assert_eq!(System::block_weight().total(), <Test as Config>::MaximumBlockWeight::get());
 		});
 	}
 
@@ -553,11 +553,11 @@ mod tests {
 			let normal_limit = normal_weight_limit();
 			let small = DispatchInfo { weight: 100, ..Default::default() };
 			let medium = DispatchInfo {
-				weight: normal_limit - <Test as Trait>::ExtrinsicBaseWeight::get(),
+				weight: normal_limit - <Test as Config>::ExtrinsicBaseWeight::get(),
 				..Default::default()
 			};
 			let big = DispatchInfo {
-				weight: normal_limit - <Test as Trait>::ExtrinsicBaseWeight::get() + 1,
+				weight: normal_limit - <Test as Config>::ExtrinsicBaseWeight::get() + 1,
 				..Default::default()
 			};
 			let len = 0_usize;
@@ -589,7 +589,7 @@ mod tests {
 
 			// We allow 75% for normal transaction, so we put 25% - extrinsic base weight
 			BlockWeight::mutate(|current_weight| {
-				current_weight.put(256 - <Test as Trait>::ExtrinsicBaseWeight::get(), DispatchClass::Normal)
+				current_weight.put(256 - <Test as Config>::ExtrinsicBaseWeight::get(), DispatchClass::Normal)
 			});
 
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
@@ -623,7 +623,7 @@ mod tests {
 			let pre = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &info, len).unwrap();
 			assert_eq!(
 				BlockWeight::get().total(),
-				info.weight + 128 + <Test as Trait>::ExtrinsicBaseWeight::get(),
+				info.weight + 128 + <Test as Config>::ExtrinsicBaseWeight::get(),
 			);
 
 			assert!(
@@ -632,7 +632,7 @@ mod tests {
 			);
 			assert_eq!(
 				BlockWeight::get().total(),
-				info.weight + 128 + <Test as Trait>::ExtrinsicBaseWeight::get(),
+				info.weight + 128 + <Test as Config>::ExtrinsicBaseWeight::get(),
 			);
 		})
 	}
@@ -644,12 +644,12 @@ mod tests {
 			let len = 0_usize;
 
 			// Initial weight from `BlockExecutionWeight`
-			assert_eq!(System::block_weight().total(), <Test as Trait>::BlockExecutionWeight::get());
+			assert_eq!(System::block_weight().total(), <Test as Config>::BlockExecutionWeight::get());
 			let r = CheckWeight::<Test>(PhantomData).pre_dispatch(&1, CALL, &free, len);
 			assert!(r.is_ok());
 			assert_eq!(
 				System::block_weight().total(),
-				<Test as Trait>::ExtrinsicBaseWeight::get() + <Test as Trait>::BlockExecutionWeight::get()
+				<Test as Config>::ExtrinsicBaseWeight::get() + <Test as Config>::BlockExecutionWeight::get()
 			);
 		})
 	}
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 595b001ea6b01..af185139fb6b0 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -20,7 +20,7 @@
 //! The System module provides low-level access to core types and cross-cutting utilities.
 //! It acts as the base layer for other pallets to interact with the Substrate framework components.
 //!
-//! - [`system::Trait`](./trait.Trait.html)
+//! - [`system::Config`](./trait.Config.html)
 //!
 //! ## Overview
 //!
@@ -74,10 +74,10 @@
 //! use frame_support::{decl_module, dispatch};
 //! use frame_system::{self as system, ensure_signed};
 //!
-//! pub trait Trait: system::Trait {}
+//! pub trait Config: system::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn system_module_example(origin) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
@@ -160,7 +160,7 @@ pub fn extrinsics_data_root<H: Hash>(xts: Vec<Vec<u8>>) -> H::Output {
 	H::ordered_trie_root(xts)
 }
 
-pub trait Trait: 'static + Eq + Clone {
+pub trait Config: 'static + Eq + Clone {
 	/// The basic call filter to use in Origin. All origins are built with this filter as base,
 	/// except Root.
 	type BaseCallFilter: Filter<Self::Call>;
@@ -270,8 +270,8 @@ pub trait Trait: 'static + Eq + Clone {
 	type SystemWeightInfo: WeightInfo;
 }
 
-pub type DigestOf<T> = generic::Digest<<T as Trait>::Hash>;
-pub type DigestItemOf<T> = generic::DigestItem<<T as Trait>::Hash>;
+pub type DigestOf<T> = generic::Digest<<T as Config>::Hash>;
+pub type DigestItemOf<T> = generic::DigestItem<<T as Config>::Hash>;
 
 pub type Key = Vec<u8>;
 pub type KeyValue = (Vec<u8>, Vec<u8>);
@@ -329,7 +329,7 @@ impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
 }
 
 /// Exposed trait-generic origin type.
-pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
+pub type Origin<T> = RawOrigin<<T as Config>::AccountId>;
 
 // Create a Hash with 69 for each byte,
 // only used to build genesis config.
@@ -390,7 +390,7 @@ impl From<sp_version::RuntimeVersion> for LastRuntimeUpgradeInfo {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as System {
+	trait Store for Module<T: Config> as System {
 		/// The full account information for a particular account ID.
 		pub Account get(fn account):
 			map hasher(blake2_128_concat) T::AccountId => AccountInfo<T::Index, T::AccountData>;
@@ -478,7 +478,7 @@ decl_storage! {
 
 decl_event!(
 	/// Event for the System module.
-	pub enum Event<T> where AccountId = <T as Trait>::AccountId {
+	pub enum Event<T> where AccountId = <T as Config>::AccountId {
 		/// An extrinsic completed successfully. \[info\]
 		ExtrinsicSuccess(DispatchInfo),
 		/// An extrinsic failed. \[error, info\]
@@ -494,7 +494,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the System module
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The name of specification does not match between the current runtime
 		/// and the new runtime.
 		InvalidSpecName,
@@ -513,7 +513,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin, system=self {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin, system=self {
 		type Error = Error<T>;
 
 		/// The maximum number of blocks to allow in mortal eras.
@@ -897,7 +897,7 @@ pub enum RefStatus {
 	Unreferenced,
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Deposits an event into this block's event record.
 	pub fn deposit_event(event: impl Into<T::Event>) {
 		Self::deposit_event_indexed(&[], event.into());
@@ -1252,7 +1252,7 @@ impl<T: Trait> Module<T> {
 
 /// Event handler which calls on_created_account when it happens.
 pub struct CallOnCreatedAccount<T>(PhantomData<T>);
-impl<T: Trait> Happened<T::AccountId> for CallOnCreatedAccount<T> {
+impl<T: Config> Happened<T::AccountId> for CallOnCreatedAccount<T> {
 	fn happened(who: &T::AccountId) {
 		Module::<T>::on_created_account(who.clone());
 	}
@@ -1260,15 +1260,15 @@ impl<T: Trait> Happened<T::AccountId> for CallOnCreatedAccount<T> {
 
 /// Event handler which calls kill_account when it happens.
 pub struct CallKillAccount<T>(PhantomData<T>);
-impl<T: Trait> Happened<T::AccountId> for CallKillAccount<T> {
+impl<T: Config> Happened<T::AccountId> for CallKillAccount<T> {
 	fn happened(who: &T::AccountId) {
 		Module::<T>::kill_account(who)
 	}
 }
 
-impl<T: Trait> BlockNumberProvider for Module<T>
+impl<T: Config> BlockNumberProvider for Module<T>
 {
-	type BlockNumber = <T as Trait>::BlockNumber;
+	type BlockNumber = <T as Config>::BlockNumber;
 
 	fn current_block_number() -> Self::BlockNumber {
 		Module::<T>::block_number()
@@ -1278,7 +1278,7 @@ impl<T: Trait> BlockNumberProvider for Module<T>
 // Implement StoredMap for a simple single-item, kill-account-on-remove system. This works fine for
 // storing a single item which is required to not be empty/default for the account to exist.
 // Anything more complex will need more sophisticated logic.
-impl<T: Trait> StoredMap<T::AccountId, T::AccountData> for Module<T> {
+impl<T: Config> StoredMap<T::AccountId, T::AccountData> for Module<T> {
 	fn get(k: &T::AccountId) -> T::AccountData {
 		Account::<T>::get(k).data
 	}
@@ -1345,7 +1345,7 @@ pub fn split_inner<T, R, S>(option: Option<T>, splitter: impl FnOnce(T) -> (R, S
 }
 
 
-impl<T: Trait> IsDeadAccount<T::AccountId> for Module<T> {
+impl<T: Config> IsDeadAccount<T::AccountId> for Module<T> {
 	fn is_dead_account(who: &T::AccountId) -> bool {
 		!Account::<T>::contains_key(who)
 	}
@@ -1358,7 +1358,7 @@ impl<T> Default for ChainContext<T> {
 	}
 }
 
-impl<T: Trait> Lookup for ChainContext<T> {
+impl<T: Config> Lookup for ChainContext<T> {
 	type Source = <T::Lookup as StaticLookup>::Source;
 	type Target = <T::Lookup as StaticLookup>::Target;
 
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index cd67a74114073..b6e1a4f35af01 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -71,7 +71,7 @@ pub struct Call;
 
 impl Dispatchable for Call {
 	type Origin = Origin;
-	type Trait = ();
+	type Config = ();
 	type Info = DispatchInfo;
 	type PostInfo = PostDispatchInfo;
 	fn dispatch(self, _origin: Self::Origin)
@@ -80,7 +80,7 @@ impl Dispatchable for Call {
 	}
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Call;
@@ -109,16 +109,16 @@ impl Trait for Test {
 }
 
 pub type System = Module<Test>;
-pub type SysEvent = <Test as Trait>::Event;
+pub type SysEvent = <Test as Config>::Event;
 
-pub const CALL: &<Test as Trait>::Call = &Call;
+pub const CALL: &<Test as Config>::Call = &Call;
 
 /// Create new externalities for `System` module tests.
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut ext: sp_io::TestExternalities = GenesisConfig::default().build_storage::<Test>().unwrap().into();
 	// Add to each test the initial weight of a block
 	ext.execute_with(|| System::register_extra_weight_unchecked(
-		<Test as Trait>::BlockExecutionWeight::get(),
+		<Test as Config>::BlockExecutionWeight::get(),
 		DispatchClass::Mandatory
 	));
 	ext
diff --git a/frame/system/src/offchain.rs b/frame/system/src/offchain.rs
index 25d18ac6bf255..f5186234b6021 100644
--- a/frame/system/src/offchain.rs
+++ b/frame/system/src/offchain.rs
@@ -447,7 +447,7 @@ pub trait AppCrypto<Public, Signature> {
 ///
 // TODO [#5663] Could this be just `T::Signature as traits::Verify>::Signer`?
 // Seems that this may cause issues with bounds resolution.
-pub trait SigningTypes: crate::Trait {
+pub trait SigningTypes: crate::Config {
 	/// A public key that is capable of identifing `AccountId`s.
 	///
 	/// Usually that's either a raw crypto public key (e.g. `sr25519::Public`) or
diff --git a/frame/system/src/weights.rs b/frame/system/src/weights.rs
index 5f3c84deb41c7..99ea4a033ca9f 100644
--- a/frame/system/src/weights.rs
+++ b/frame/system/src/weights.rs
@@ -54,7 +54,7 @@ pub trait WeightInfo {
 
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: crate::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
 		(1_973_000 as Weight)
 	}
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index d546a34017d0a..66043cbe3aaf7 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -19,7 +19,7 @@
 //!
 //! The Timestamp module provides functionality to get and set the on-chain time.
 //!
-//! - [`timestamp::Trait`](./trait.Trait.html)
+//! - [`timestamp::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -46,7 +46,7 @@
 //! * `get` - Gets the current time for the current block. If this function is called prior to
 //! setting the timestamp, it will return the timestamp of the previous block.
 //!
-//! ### Trait Getters
+//! ### Config Getters
 //!
 //! * `MinimumPeriod` - Gets the minimum (and advised) period between blocks for the chain.
 //!
@@ -66,10 +66,10 @@
 //! # use pallet_timestamp as timestamp;
 //! use frame_system::ensure_signed;
 //!
-//! pub trait Trait: timestamp::Trait {}
+//! pub trait Config: timestamp::Config {}
 //!
 //! decl_module! {
-//! 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+//! 	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 //! 		#[weight = 0]
 //! 		pub fn get_time(origin) -> dispatch::DispatchResult {
 //! 			let _sender = ensure_signed(origin)?;
@@ -118,7 +118,7 @@ use sp_timestamp::{
 pub use weights::WeightInfo;
 
 /// The module configuration trait
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Type used for expressing timestamp.
 	type Moment: Parameter + Default + AtLeast32Bit
 		+ Scale<Self::BlockNumber, Output = Self::Moment> + Copy;
@@ -137,7 +137,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The minimum period between blocks. Beware that this is different to the *expected* period
 		/// that the block production apparatus provides. Your chosen consensus system will generally
 		/// work with this to determine a sensible block time. e.g. For Aura, it will be double this
@@ -194,7 +194,7 @@ decl_module! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Timestamp {
+	trait Store for Module<T: Config> as Timestamp {
 		/// Current time for the current block.
 		pub Now get(fn now): T::Moment;
 
@@ -203,7 +203,7 @@ decl_storage! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Get the current time for the current block.
 	///
 	/// NOTE: if this function is called prior to setting the timestamp,
@@ -225,7 +225,7 @@ fn extract_inherent_data(data: &InherentData) -> Result<InherentType, RuntimeStr
 		.ok_or_else(|| "Timestamp inherent data is not provided.".into())
 }
 
-impl<T: Trait> ProvideInherent for Module<T> {
+impl<T: Config> ProvideInherent for Module<T> {
 	type Call = Call<T>;
 	type Error = InherentError;
 	const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER;
@@ -260,7 +260,7 @@ impl<T: Trait> ProvideInherent for Module<T> {
 	}
 }
 
-impl<T: Trait> Time for Module<T> {
+impl<T: Config> Time for Module<T> {
 	type Moment = T::Moment;
 
 	/// Before the first set of now with inherent the value returned is zero.
@@ -272,7 +272,7 @@ impl<T: Trait> Time for Module<T> {
 /// Before the timestamp inherent is applied, it returns the time of previous block.
 ///
 /// On genesis the time returned is not valid.
-impl<T: Trait> UnixTime for Module<T> {
+impl<T: Config> UnixTime for Module<T> {
 	fn now() -> core::time::Duration {
 		// now is duration since unix epoch in millisecond as documented in
 		// `sp_timestamp::InherentDataProvider`.
@@ -314,7 +314,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -344,7 +344,7 @@ mod tests {
 	parameter_types! {
 		pub const MinimumPeriod: u64 = 5;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Moment = u64;
 		type OnTimestampSet = ();
 		type MinimumPeriod = MinimumPeriod;
diff --git a/frame/timestamp/src/weights.rs b/frame/timestamp/src/weights.rs
index 67ce28ba9111f..d3f2dcc7ba6fa 100644
--- a/frame/timestamp/src/weights.rs
+++ b/frame/timestamp/src/weights.rs
@@ -50,7 +50,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_timestamp using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set() -> Weight {
 		(11_650_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 751aa57da0f80..554b2e801afe0 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -25,11 +25,11 @@
 //!     chance to be included by the transaction queue.
 //!
 //! Additionally, this module allows one to configure:
-//!   - The mapping between one unit of weight to one unit of fee via [`Trait::WeightToFee`].
+//!   - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
 //!   - A means of updating the fee for the next block, via defining a multiplier, based on the
 //!     final state of the chain at the end of the previous block. This can be configured via
-//!     [`Trait::FeeMultiplierUpdate`]
-//!   - How the fees are paid via [`Trait::OnChargeTransaction`].
+//!     [`Config::FeeMultiplierUpdate`]
+//!   - How the fees are paid via [`Config::OnChargeTransaction`].
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -63,7 +63,7 @@ pub use payment::*;
 pub type Multiplier = FixedU128;
 
 type BalanceOf<T> =
-	<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
+	<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
 
 /// A struct to update the weight multiplier per block. It implements `Convert<Multiplier,
 /// Multiplier>`, meaning that it can convert the previous multiplier to the next one. This should
@@ -135,7 +135,7 @@ impl MultiplierUpdate for () {
 }
 
 impl<T, S, V, M> MultiplierUpdate for TargetedFeeAdjustment<T, S, V, M>
-	where T: frame_system::Trait, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
+	where T: frame_system::Config, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
 {
 	fn min() -> Multiplier {
 		M::get()
@@ -149,7 +149,7 @@ impl<T, S, V, M> MultiplierUpdate for TargetedFeeAdjustment<T, S, V, M>
 }
 
 impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S, V, M>
-	where T: frame_system::Trait, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
+	where T: frame_system::Config, S: Get<Perquintill>, V: Get<Multiplier>, M: Get<Multiplier>,
 {
 	fn convert(previous: Multiplier) -> Multiplier {
 		// Defensive only. The multiplier in storage should always be at most positive. Nonetheless
@@ -160,8 +160,8 @@ impl<T, S, V, M> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T, S,
 
 		// the computed ratio is only among the normal class.
 		let normal_max_weight =
-			<T as frame_system::Trait>::AvailableBlockRatio::get() *
-			<T as frame_system::Trait>::MaximumBlockWeight::get();
+			<T as frame_system::Config>::AvailableBlockRatio::get() *
+			<T as frame_system::Config>::MaximumBlockWeight::get();
 		let normal_block_weight =
 			<frame_system::Module<T>>::block_weight()
 			.get(frame_support::weights::DispatchClass::Normal)
@@ -213,7 +213,7 @@ impl Default for Releases {
 	}
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// Handler for withdrawing, refunding and depositing the transaction fee.
 	/// Transaction fees are withdrawn before the transaction is executed.
 	/// After the transaction was executed the transaction weight can be
@@ -233,7 +233,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as TransactionPayment {
+	trait Store for Module<T: Config> as TransactionPayment {
 		pub NextFeeMultiplier get(fn next_fee_multiplier): Multiplier = Multiplier::saturating_from_integer(1);
 
 		StorageVersion build(|_: &GenesisConfig| Releases::V2): Releases;
@@ -241,7 +241,7 @@ decl_storage! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// The fee to be paid for making a transaction; the per-byte portion.
 		const TransactionByteFee: BalanceOf<T> = T::TransactionByteFee::get();
 
@@ -263,7 +263,7 @@ decl_module! {
 			assert!(
 				<Multiplier as sp_runtime::traits::Bounded>::max_value() >=
 				Multiplier::checked_from_integer(
-					<T as frame_system::Trait>::MaximumBlockWeight::get().try_into().unwrap()
+					<T as frame_system::Config>::MaximumBlockWeight::get().try_into().unwrap()
 				).unwrap(),
 			);
 
@@ -296,7 +296,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> where
+impl<T: Config> Module<T> where
 	BalanceOf<T>: FixedPointOperand
 {
 	/// Query the data that we know about the fee of a given `call`.
@@ -407,13 +407,13 @@ impl<T: Trait> Module<T> where
 	fn weight_to_fee(weight: Weight) -> BalanceOf<T> {
 		// cap the weight to the maximum defined in runtime, otherwise it will be the
 		// `Bounded` maximum of its data type, which is not desired.
-		let capped_weight = weight.min(<T as frame_system::Trait>::MaximumBlockWeight::get());
+		let capped_weight = weight.min(<T as frame_system::Config>::MaximumBlockWeight::get());
 		T::WeightToFee::calc(&capped_weight)
 	}
 }
 
 impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
-	T: Trait,
+	T: Config,
 	BalanceOf<T>: FixedPointOperand,
 {
 	/// Compute the fee for the specified weight.
@@ -429,9 +429,9 @@ impl<T> Convert<Weight, BalanceOf<T>> for Module<T> where
 /// Require the transactor pay for themselves and maybe include a tip to gain additional priority
 /// in the queue.
 #[derive(Encode, Decode, Clone, Eq, PartialEq)]
-pub struct ChargeTransactionPayment<T: Trait + Send + Sync>(#[codec(compact)] BalanceOf<T>);
+pub struct ChargeTransactionPayment<T: Config + Send + Sync>(#[codec(compact)] BalanceOf<T>);
 
-impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
+impl<T: Config + Send + Sync> ChargeTransactionPayment<T> where
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 	BalanceOf<T>: Send + Sync + FixedPointOperand,
 {
@@ -449,14 +449,14 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
 	) -> Result<
 		(
 			BalanceOf<T>,
-			<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
+			<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
 		),
 		TransactionValidityError,
 	> {
 		let tip = self.0;
 		let fee = Module::<T>::compute_fee(len as u32, info, tip);
 
-		<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
+		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::withdraw_fee(who, call, info, fee, tip)
 			.map(|i| (fee, i))
 	}
 
@@ -478,7 +478,7 @@ impl<T: Trait + Send + Sync> ChargeTransactionPayment<T> where
 	}
 }
 
-impl<T: Trait + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
+impl<T: Config + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T> {
 	#[cfg(feature = "std")]
 	fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
 		write!(f, "ChargeTransactionPayment<{:?}>", self.0)
@@ -489,7 +489,7 @@ impl<T: Trait + Send + Sync> sp_std::fmt::Debug for ChargeTransactionPayment<T>
 	}
 }
 
-impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> where
+impl<T: Config + Send + Sync> SignedExtension for ChargeTransactionPayment<T> where
 	BalanceOf<T>: Send + Sync + From<u64> + FixedPointOperand,
 	T::Call: Dispatchable<Info=DispatchInfo, PostInfo=PostDispatchInfo>,
 {
@@ -503,7 +503,7 @@ impl<T: Trait + Send + Sync> SignedExtension for ChargeTransactionPayment<T> whe
 		// who paid the fee
 		Self::AccountId,
 		// imbalance resulting from withdrawing the fee
-		<<T as Trait>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
+		<<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
 	);
 	fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { Ok(()) }
 
@@ -573,7 +573,7 @@ mod tests {
 	};
 	use smallvec::smallvec;
 
-	const CALL: &<Runtime as frame_system::Trait>::Call =
+	const CALL: &<Runtime as frame_system::Config>::Call =
 		&Call::Balances(BalancesCall::transfer(2, 69));
 
 	impl_outer_dispatch! {
@@ -608,7 +608,7 @@ mod tests {
 		pub static WeightToFee: u64 = 1;
 	}
 
-	impl frame_system::Trait for Runtime {
+	impl frame_system::Config for Runtime {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -640,7 +640,7 @@ mod tests {
 		pub const ExistentialDeposit: u64 = 1;
 	}
 
-	impl pallet_balances::Trait for Runtime {
+	impl pallet_balances::Config for Runtime {
 		type Balance = u64;
 		type Event = Event;
 		type DustRemoval = ();
@@ -663,7 +663,7 @@ mod tests {
 		}
 	}
 
-	impl Trait for Runtime {
+	impl Config for Runtime {
 		type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
 		type TransactionByteFee = TransactionByteFee;
 		type WeightToFee = WeightToFee;
@@ -841,7 +841,7 @@ mod tests {
 			// fee will be proportional to what is the actual maximum weight in the runtime.
 			assert_eq!(
 				Balances::free_balance(&1),
-				(10000 - <Runtime as frame_system::Trait>::MaximumBlockWeight::get()) as u64
+				(10000 - <Runtime as frame_system::Config>::MaximumBlockWeight::get()) as u64
 			);
 		});
 	}
diff --git a/frame/transaction-payment/src/payment.rs b/frame/transaction-payment/src/payment.rs
index de39215b575be..f84b19d78c297 100644
--- a/frame/transaction-payment/src/payment.rs
+++ b/frame/transaction-payment/src/payment.rs
@@ -1,5 +1,5 @@
 ///! Traits and default implementation for paying transaction fees.
-use crate::Trait;
+use crate::Config;
 use codec::FullCodec;
 use frame_support::{
 	traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReasons},
@@ -12,10 +12,10 @@ use sp_runtime::{
 use sp_std::{fmt::Debug, marker::PhantomData};
 
 type NegativeImbalanceOf<C, T> =
-	<C as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
 /// Handle withdrawing, refunding and depositing of transaction fees.
-pub trait OnChargeTransaction<T: Trait> {
+pub trait OnChargeTransaction<T: Config> {
 	/// The underlying integer type in which fees are calculated.
 	type Balance: AtLeast32BitUnsigned + FullCodec + Copy + MaybeSerializeDeserialize + Debug + Default;
 	type LiquidityInfo: Default;
@@ -55,17 +55,17 @@ pub struct CurrencyAdapter<C, OU>(PhantomData<(C, OU)>);
 /// Default implementation for a Currency and an OnUnbalanced handler.
 impl<T, C, OU> OnChargeTransaction<T> for CurrencyAdapter<C, OU>
 where
-	T: Trait,
-	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance>,
-	C: Currency<<T as frame_system::Trait>::AccountId>,
+	T: Config,
+	T::TransactionByteFee: Get<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance>,
+	C: Currency<<T as frame_system::Config>::AccountId>,
 	C::PositiveImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
+		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::NegativeImbalance>,
 	C::NegativeImbalance:
-		Imbalance<<C as Currency<<T as frame_system::Trait>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
+		Imbalance<<C as Currency<<T as frame_system::Config>::AccountId>>::Balance, Opposite = C::PositiveImbalance>,
 	OU: OnUnbalanced<NegativeImbalanceOf<C, T>>,
 {
 	type LiquidityInfo = Option<NegativeImbalanceOf<C, T>>;
-	type Balance = <C as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	type Balance = <C as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 	/// Withdraw the predicted fee from the transaction origin.
 	///
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index 2794e6cc43203..4606689e86d91 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -30,7 +30,7 @@ use crate::Module as Treasury;
 const SEED: u32 = 0;
 
 // Create the pre-requisite information needed to create a treasury `propose_spend`.
-fn setup_proposal<T: Trait<I>, I: Instance>(u: u32) -> (
+fn setup_proposal<T: Config<I>, I: Instance>(u: u32) -> (
 	T::AccountId,
 	BalanceOf<T, I>,
 	<T::Lookup as StaticLookup>::Source,
@@ -44,7 +44,7 @@ fn setup_proposal<T: Trait<I>, I: Instance>(u: u32) -> (
 }
 
 // Create the pre-requisite information needed to create a `report_awesome`.
-fn setup_awesome<T: Trait<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
+fn setup_awesome<T: Config<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
 	let caller = whitelisted_caller();
 	let value = T::TipReportDepositBase::get()
 		+ T::DataDepositPerByte::get() * length.into()
@@ -56,7 +56,7 @@ fn setup_awesome<T: Trait<I>, I: Instance>(length: u32) -> (T::AccountId, Vec<u8
 }
 
 // Create the pre-requisite information needed to call `tip_new`.
-fn setup_tip<T: Trait<I>, I: Instance>(r: u32, t: u32) ->
+fn setup_tip<T: Config<I>, I: Instance>(r: u32, t: u32) ->
 	Result<(T::AccountId, Vec<u8>, T::AccountId, BalanceOf<T, I>), &'static str>
 {
 	let tippers_count = T::Tippers::count();
@@ -77,7 +77,7 @@ fn setup_tip<T: Trait<I>, I: Instance>(r: u32, t: u32) ->
 
 // Create `t` new tips for the tip proposal with `hash`.
 // This function automatically makes the tip able to close.
-fn create_tips<T: Trait<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf<T, I>) ->
+fn create_tips<T: Config<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf<T, I>) ->
 	Result<(), &'static str>
 {
 	for i in 0 .. t {
@@ -94,7 +94,7 @@ fn create_tips<T: Trait<I>, I: Instance>(t: u32, hash: T::Hash, value: BalanceOf
 }
 
 // Create proposals that are approved for use in `on_initialize`.
-fn create_approved_proposals<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
+fn create_approved_proposals<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
 	for i in 0 .. n {
 		let (caller, value, lookup) = setup_proposal::<T, I>(i);
 		Treasury::<T, I>::propose_spend(
@@ -110,7 +110,7 @@ fn create_approved_proposals<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'s
 }
 
 // Create bounties that are approved for use in `on_initialize`.
-fn create_approved_bounties<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
+fn create_approved_bounties<T: Config<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
 	for i in 0 .. n {
 		let (caller, _curator, _fee, value, reason) = setup_bounty::<T, I>(i, MAX_BYTES);
 		Treasury::<T, I>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
@@ -122,7 +122,7 @@ fn create_approved_bounties<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'st
 }
 
 // Create the pre-requisite information needed to create a treasury `propose_bounty`.
-fn setup_bounty<T: Trait<I>, I: Instance>(u: u32, d: u32) -> (
+fn setup_bounty<T: Config<I>, I: Instance>(u: u32, d: u32) -> (
 	T::AccountId,
 	T::AccountId,
 	BalanceOf<T, I>,
@@ -140,7 +140,7 @@ fn setup_bounty<T: Trait<I>, I: Instance>(u: u32, d: u32) -> (
 	(caller, curator, fee, value, reason)
 }
 
-fn create_bounty<T: Trait<I>, I: Instance>() -> Result<(
+fn create_bounty<T: Config<I>, I: Instance>() -> Result<(
 	<T::Lookup as StaticLookup>::Source,
 	BountyIndex,
 ), &'static str> {
@@ -155,7 +155,7 @@ fn create_bounty<T: Trait<I>, I: Instance>() -> Result<(
 	Ok((curator_lookup, bounty_id))
 }
 
-fn setup_pod_account<T: Trait<I>, I: Instance>() {
+fn setup_pod_account<T: Config<I>, I: Instance>() {
 	let pot_account = Treasury::<T, I>::account_id();
 	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 2ada0660f9ec2..e180f64d1cbdf 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -20,7 +20,7 @@
 //! The Treasury module provides a "pot" of funds that can be managed by stakeholders in the
 //! system and a structure for making spending proposals from this pot.
 //!
-//! - [`treasury::Trait`](./trait.Trait.html)
+//! - [`treasury::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -38,7 +38,7 @@
 //! given without first having a pre-determined stakeholder group come to consensus on how much
 //! should be paid.
 //!
-//! A group of `Tippers` is determined through the config `Trait`. After half of these have declared
+//! A group of `Tippers` is determined through the config `Config`. After half of these have declared
 //! some amount that they believe a particular reported reason deserves, then a countdown period is
 //! entered where any remaining members can declare their tip amounts also. After the close of the
 //! countdown period, the median of all declared tips is paid to the reported beneficiary, along
@@ -155,13 +155,13 @@ use frame_system::{self as system, ensure_signed};
 pub use weights::WeightInfo;
 
 type BalanceOf<T, I> =
-	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 type PositiveImbalanceOf<T, I> =
-	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::PositiveImbalance;
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::PositiveImbalance;
 type NegativeImbalanceOf<T, I> =
-	<<T as Trait<I>>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::NegativeImbalance;
+	<<T as Config<I>>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 
-pub trait Trait<I=DefaultInstance>: frame_system::Trait {
+pub trait Config<I=DefaultInstance>: frame_system::Config {
 	/// The treasury's module id, used for deriving its sovereign account ID.
 	type ModuleId: Get<ModuleId>;
 
@@ -192,7 +192,7 @@ pub trait Trait<I=DefaultInstance>: frame_system::Trait {
 	type DataDepositPerByte: Get<BalanceOf<Self, I>>;
 
 	/// The overarching event type.
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Handler for the unbalanced decrease when slashing for a rejected proposal or bounty.
 	type OnSlash: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
@@ -332,7 +332,7 @@ pub enum BountyStatus<AccountId, BlockNumber> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Treasury {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Treasury {
 		/// Number of proposals that have been made.
 		ProposalCount get(fn proposal_count): ProposalIndex;
 
@@ -388,8 +388,8 @@ decl_event!(
 	pub enum Event<T, I=DefaultInstance>
 	where
 		Balance = BalanceOf<T, I>,
-		<T as frame_system::Trait>::AccountId,
-		<T as frame_system::Trait>::Hash,
+		<T as frame_system::Config>::AccountId,
+		<T as frame_system::Config>::Hash,
 	{
 		/// New proposal. \[proposal_index\]
 		Proposed(ProposalIndex),
@@ -433,7 +433,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the treasury module.
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Proposer's balance is too low.
 		InsufficientProposersBalance,
 		/// No proposal or bounty at that index.
@@ -465,7 +465,7 @@ decl_error! {
 }
 
 decl_module! {
-	pub struct Module<T: Trait<I>, I: Instance=DefaultInstance>
+	pub struct Module<T: Config<I>, I: Instance=DefaultInstance>
 		for enum Call
 		where origin: T::Origin
 	{
@@ -1159,7 +1159,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	// Add public immutables and private mutables.
 
 	/// The account ID of the treasury pot.
@@ -1452,7 +1452,7 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> OnUnbalanced<NegativeImbalanceOf<T, I>> for Module<T, I> {
+impl<T: Config<I>, I: Instance> OnUnbalanced<NegativeImbalanceOf<T, I>> for Module<T, I> {
 	fn on_nonzero_unbalanced(amount: NegativeImbalanceOf<T, I>) {
 		let numeric_amount = amount.peek();
 
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 88c4f23b91ae2..bbc38ddc8f811 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -59,7 +59,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Index = u64;
@@ -89,7 +89,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type Event = Event;
@@ -140,7 +140,7 @@ parameter_types! {
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: u64 = 1;
 }
-impl Trait for Test {
+impl Config for Test {
 	type ModuleId = TreasuryModuleId;
 	type Currency = pallet_balances::Module<Test>;
 	type ApproveOrigin = frame_system::EnsureRoot<u128>;
diff --git a/frame/treasury/src/weights.rs b/frame/treasury/src/weights.rs
index 646b9869f47ef..013a27a5cdc9d 100644
--- a/frame/treasury/src/weights.rs
+++ b/frame/treasury/src/weights.rs
@@ -68,7 +68,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_treasury using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
 		(56_844_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
diff --git a/frame/utility/src/benchmarking.rs b/frame/utility/src/benchmarking.rs
index 413ed66ac8498..501e1b293bcc1 100644
--- a/frame/utility/src/benchmarking.rs
+++ b/frame/utility/src/benchmarking.rs
@@ -25,9 +25,9 @@ use frame_benchmarking::{benchmarks, account, whitelisted_caller};
 
 const SEED: u32 = 0;
 
-fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 	let events = frame_system::Module::<T>::events();
-	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	let system_event: <T as frame_system::Config>::Event = generic_event.into();
 	// compare to the last event record
 	let EventRecord { event, .. } = &events[events.len() - 1];
 	assert_eq!(event, &system_event);
@@ -38,7 +38,7 @@ benchmarks! {
 
 	batch {
 		let c in 0 .. 1000;
-		let mut calls: Vec<<T as Trait>::Call> = Vec::new();
+		let mut calls: Vec<<T as Config>::Call> = Vec::new();
 		for i in 0 .. c {
 			let call = frame_system::Call::remark(vec![]).into();
 			calls.push(call);
@@ -59,7 +59,7 @@ benchmarks! {
 
 	batch_all {
 		let c in 0 .. 1000;
-		let mut calls: Vec<<T as Trait>::Call> = Vec::new();
+		let mut calls: Vec<<T as Config>::Call> = Vec::new();
 		for i in 0 .. c {
 			let call = frame_system::Call::remark(vec![]).into();
 			calls.push(call);
diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs
index e7ff09c8f0db1..3aee32b250d5b 100644
--- a/frame/utility/src/lib.rs
+++ b/frame/utility/src/lib.rs
@@ -18,7 +18,7 @@
 //! # Utility Module
 //! A stateless module with helpers for dispatch management which does no re-authentication.
 //!
-//! - [`utility::Trait`](./trait.Trait.html)
+//! - [`utility::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -50,7 +50,7 @@
 //! * `as_derivative` - Dispatch a call from a derivative signed origin.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -74,9 +74,9 @@ use sp_runtime::{DispatchError, traits::Dispatchable};
 pub use weights::WeightInfo;
 
 /// Configuration trait.
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The overarching call type.
 	type Call: Parameter + Dispatchable<Origin=Self::Origin, PostInfo=PostDispatchInfo>
@@ -88,7 +88,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Utility {}
+	trait Store for Module<T: Config> as Utility {}
 }
 
 decl_event! {
@@ -111,7 +111,7 @@ impl TypeId for IndexedUtilityModuleId {
 }
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		/// Deposit one of this module's events by using the default implementation.
 		fn deposit_event() = default;
 
@@ -122,7 +122,7 @@ decl_module! {
 		/// - `calls`: The calls to be dispatched from the same origin.
 		///
 		/// If origin is root then call are dispatch without checking origin filter. (This includes
-		/// bypassing `frame_system::Trait::BaseCallFilter`).
+		/// bypassing `frame_system::Config::BaseCallFilter`).
 		///
 		/// # <weight>
 		/// - Complexity: O(C) where C is the number of calls to be batched.
@@ -149,7 +149,7 @@ decl_module! {
 				}
 			},
 		)]
-		fn batch(origin, calls: Vec<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn batch(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
 			// Track the actual weight of each of the batch calls.
@@ -197,7 +197,7 @@ decl_module! {
 				.saturating_add(T::DbWeight::get().reads_writes(1, 1)),
 			call.get_dispatch_info().class,
 		)]
-		fn as_derivative(origin, index: u16, call: Box<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn as_derivative(origin, index: u16, call: Box<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let mut origin = origin;
 			let who = ensure_signed(origin.clone())?;
 			let pseudonym = Self::derivative_account_id(who, index);
@@ -222,7 +222,7 @@ decl_module! {
 		/// - `calls`: The calls to be dispatched from the same origin.
 		///
 		/// If origin is root then call are dispatch without checking origin filter. (This includes
-		/// bypassing `frame_system::Trait::BaseCallFilter`).
+		/// bypassing `frame_system::Config::BaseCallFilter`).
 		///
 		/// # <weight>
 		/// - Complexity: O(C) where C is the number of calls to be batched.
@@ -244,7 +244,7 @@ decl_module! {
 			},
 		)]
 		#[transactional]
-		fn batch_all(origin, calls: Vec<<T as Trait>::Call>) -> DispatchResultWithPostInfo {
+		fn batch_all(origin, calls: Vec<<T as Config>::Call>) -> DispatchResultWithPostInfo {
 			let is_root = ensure_root(origin.clone()).is_ok();
 			let calls_len = calls.len();
 			// Track the actual weight of each of the batch calls.
@@ -274,7 +274,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Derive a derivative account ID from the owner account and the sub-account index.
 	pub fn derivative_account_id(who: T::AccountId, index: u16) -> T::AccountId {
 		let entropy = (b"modlpy/utilisuba", who, index).using_encoded(blake2_256);
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index a3c33bdf2081f..5c1cbaf94cbf2 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -37,10 +37,10 @@ use crate as utility;
 pub mod example {
 	use super::*;
 	use frame_support::dispatch::WithPostDispatchInfo;
-	pub trait Trait: frame_system::Trait { }
+	pub trait Config: frame_system::Config { }
 
 	decl_module! {
-		pub struct Module<T: Trait> for enum Call where origin: <T as frame_system::Trait>::Origin {
+		pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
 			#[weight = *weight]
 			fn noop(_origin, weight: Weight) { }
 
@@ -97,7 +97,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type BaseCallFilter = TestBaseCallFilter;
 	type Origin = Origin;
 	type Index = u64;
@@ -127,7 +127,7 @@ impl frame_system::Trait for Test {
 parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
-impl pallet_balances::Trait for Test {
+impl pallet_balances::Config for Test {
 	type MaxLocks = ();
 	type Balance = u64;
 	type DustRemoval = ();
@@ -142,7 +142,7 @@ parameter_types! {
 	pub const MaxSignatories: u16 = 3;
 }
 
-impl example::Trait for Test {}
+impl example::Config for Test {}
 
 pub struct TestBaseCallFilter;
 impl Filter<Call> for TestBaseCallFilter {
@@ -158,7 +158,7 @@ impl Filter<Call> for TestBaseCallFilter {
 		}
 	}
 }
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type Call = Call;
 	type WeightInfo = ();
@@ -428,7 +428,7 @@ fn batch_handles_weight_refund() {
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight
-			<Test as Trait>::WeightInfo::batch(2) + end_weight * 2,
+			<Test as Config>::WeightInfo::batch(2) + end_weight * 2,
 		);
 	});
 }
@@ -465,7 +465,7 @@ fn batch_all_revert() {
 			]),
 			DispatchErrorWithPostInfo {
 				post_info: PostDispatchInfo {
-					actual_weight: Some(<Test as Trait>::WeightInfo::batch_all(2) + info.weight * 2),
+					actual_weight: Some(<Test as Config>::WeightInfo::batch_all(2) + info.weight * 2),
 					pays_fee: Pays::Yes
 				},
 				error: pallet_balances::Error::<Test, _>::InsufficientBalance.into()
@@ -536,7 +536,7 @@ fn batch_all_handles_weight_refund() {
 		assert_eq!(
 			extract_actual_weight(&result, &info),
 			// Real weight is 2 calls at end_weight
-			<Test as Trait>::WeightInfo::batch_all(2) + end_weight * 2,
+			<Test as Config>::WeightInfo::batch_all(2) + end_weight * 2,
 		);
 	});
 }
diff --git a/frame/utility/src/weights.rs b/frame/utility/src/weights.rs
index 73e4e3b1d93b9..c03ef0d064b99 100644
--- a/frame/utility/src/weights.rs
+++ b/frame/utility/src/weights.rs
@@ -51,7 +51,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_utility using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
 		(20_071_000 as Weight)
 			.saturating_add((2_739_000 as Weight).saturating_mul(c as Weight))
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 652d10aab3ae4..0cb030668d050 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -29,9 +29,9 @@ use crate::Module as Vesting;
 
 const SEED: u32 = 0;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-fn add_locks<T: Trait>(who: &T::AccountId, n: u8) {
+fn add_locks<T: Config>(who: &T::AccountId, n: u8) {
 	for id in 0..n {
 		let lock_id = [id; 8];
 		let locked = 100u32;
@@ -40,7 +40,7 @@ fn add_locks<T: Trait>(who: &T::AccountId, n: u8) {
 	}
 }
 
-fn add_vesting_schedule<T: Trait>(who: &T::AccountId) -> Result<(), &'static str> {
+fn add_vesting_schedule<T: Config>(who: &T::AccountId) -> Result<(), &'static str> {
 	let locked = 100u32;
 	let per_block = 10u32;
 	let starting_block = 1u32;
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index c09516c2cc27c..4dbe27649ce90 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -17,7 +17,7 @@
 
 //! # Vesting Module
 //!
-//! - [`vesting::Trait`](./trait.Trait.html)
+//! - [`vesting::Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //!
 //! ## Overview
@@ -43,7 +43,7 @@
 //!   "vested" so far.
 //!
 //! [`Call`]: ./enum.Call.html
-//! [`Trait`]: ./trait.Trait.html
+//! [`Config`]: ./trait.Config.html
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -64,12 +64,12 @@ use frame_support::traits::{
 use frame_system::{ensure_signed, ensure_root};
 pub use weights::WeightInfo;
 
-type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-type MaxLocksOf<T> = <<T as Trait>::Currency as LockableCurrency<<T as frame_system::Trait>::AccountId>>::MaxLocks;
+type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+type MaxLocksOf<T> = <<T as Config>::Currency as LockableCurrency<<T as frame_system::Config>::AccountId>>::MaxLocks;
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The overarching event type.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
+	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// The currency trait.
 	type Currency: LockableCurrency<Self::AccountId>;
@@ -120,7 +120,7 @@ impl<
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Vesting {
+	trait Store for Module<T: Config> as Vesting {
 		/// Information regarding the vesting of a given account.
 		pub Vesting get(fn vesting):
 			map hasher(blake2_128_concat) T::AccountId
@@ -156,7 +156,7 @@ decl_storage! {
 }
 
 decl_event!(
-	pub enum Event<T> where AccountId = <T as frame_system::Trait>::AccountId, Balance = BalanceOf<T> {
+	pub enum Event<T> where AccountId = <T as frame_system::Config>::AccountId, Balance = BalanceOf<T> {
 		/// The amount vested has been updated. This could indicate more funds are available. The
 		/// balance given is the amount which is left unvested (and thus locked).
 		/// \[account, unvested\]
@@ -168,7 +168,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for the vesting module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The account given is not vesting.
 		NotVesting,
 		/// An existing vesting schedule already exists for this account that cannot be clobbered.
@@ -180,7 +180,7 @@ decl_error! {
 
 decl_module! {
 	/// Vesting module declaration.
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {
 		type Error = Error<T>;
 
 		/// The minimum amount to be transferred to create a new vesting schedule.
@@ -309,7 +309,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// (Re)set or remove the module's currency lock on `who`'s account in accordance with their
 	/// current unvested amount.
 	fn update_lock(who: T::AccountId) -> DispatchResult {
@@ -330,7 +330,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> VestingSchedule<T::AccountId> for Module<T> where
+impl<T: Config> VestingSchedule<T::AccountId> for Module<T> where
 	BalanceOf<T>: MaybeSerializeDeserialize + Debug
 {
 	type Moment = T::BlockNumber;
@@ -413,7 +413,7 @@ mod tests {
 		pub const MaximumBlockLength: u32 = 2 * 1024;
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
-	impl frame_system::Trait for Test {
+	impl frame_system::Config for Test {
 		type BaseCallFilter = ();
 		type Origin = Origin;
 		type Index = u64;
@@ -443,7 +443,7 @@ mod tests {
 	parameter_types! {
 		pub const MaxLocks: u32 = 10;
 	}
-	impl pallet_balances::Trait for Test {
+	impl pallet_balances::Config for Test {
 		type Balance = u64;
 		type DustRemoval = ();
 		type Event = ();
@@ -456,7 +456,7 @@ mod tests {
 		pub const MinVestedTransfer: u64 = 256 * 2;
 		pub static ExistentialDeposit: u64 = 0;
 	}
-	impl Trait for Test {
+	impl Config for Test {
 		type Event = ();
 		type Currency = Balances;
 		type BlockNumberToBalance = Identity;
diff --git a/frame/vesting/src/weights.rs b/frame/vesting/src/weights.rs
index 23a46ec763d89..3d2d6dd9670eb 100644
--- a/frame/vesting/src/weights.rs
+++ b/frame/vesting/src/weights.rs
@@ -54,7 +54,7 @@ pub trait WeightInfo {
 
 /// Weights for pallet_vesting using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vest_locked(l: u32, ) -> Weight {
 		(57_472_000 as Weight)
 			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index 85f5a1797b1e3..5839618e37334 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -410,7 +410,7 @@ fn extend_with_runtime_decl_path(mut trait_: Path) -> Path {
 			.segments
 			.last()
 			.as_ref()
-			.expect("Trait path should always contain at least one item; qed")
+			.expect("Config path should always contain at least one item; qed")
 			.ident;
 
 		generate_runtime_mod_name_for_trait(trait_name)
diff --git a/primitives/runtime/src/offchain/storage_lock.rs b/primitives/runtime/src/offchain/storage_lock.rs
index a3838f21fd13d..451753931ec9b 100644
--- a/primitives/runtime/src/offchain/storage_lock.rs
+++ b/primitives/runtime/src/offchain/storage_lock.rs
@@ -438,11 +438,11 @@ pub trait BlockNumberProvider {
 	///
 	/// In case of using crate `sp_runtime` without the crate `frame`
 	/// system, it is already implemented for
-	/// `frame_system::Module<T: Trait>` as:
+	/// `frame_system::Module<T: Config>` as:
 	///
 	/// ```ignore
 	/// fn current_block_number() -> Self {
-	///     frame_system::Module<Trait>::block_number()
+	///     frame_system::Module<Config>::block_number()
 	/// }
 	/// ```
 	/// .
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 4ce9ac0afa9a3..d475be3579baf 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -693,7 +693,7 @@ pub trait Dispatchable {
 	/// identifier for the caller. The origin can be empty in the case of an inherent extrinsic.
 	type Origin;
 	/// ...
-	type Trait;
+	type Config;
 	/// An opaque set of information attached to the transaction. This could be constructed anywhere
 	/// down the line in a runtime. The current Substrate runtime uses a struct with the same name
 	/// to represent the dispatch class and weight.
@@ -712,7 +712,7 @@ pub type PostDispatchInfoOf<T> = <T as Dispatchable>::PostInfo;
 
 impl Dispatchable for () {
 	type Origin = ();
-	type Trait = ();
+	type Config = ();
 	type Info = ();
 	type PostInfo = ();
 	fn dispatch(self, _origin: Self::Origin) -> crate::DispatchResultWithInfo<Self::PostInfo> {
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 2024467771057..b4a69a491d588 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -197,7 +197,7 @@ impl ExtrinsicT for Extrinsic {
 
 impl sp_runtime::traits::Dispatchable for Extrinsic {
 	type Origin = Origin;
-	type Trait = ();
+	type Config = ();
 	type Info = ();
 	type PostInfo = ();
 	fn dispatch(self, _origin: Self::Origin) -> sp_runtime::DispatchResultWithInfo<Self::PostInfo> {
@@ -436,7 +436,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = ();
 	type Origin = Origin;
 	type Call = Extrinsic;
@@ -464,7 +464,7 @@ impl frame_system::Trait for Runtime {
 	type SystemWeightInfo = ();
 }
 
-impl pallet_timestamp::Trait for Runtime {
+impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = ();
@@ -477,7 +477,7 @@ parameter_types! {
 	pub const ExpectedBlockTime: u64 = 10_000;
 }
 
-impl pallet_babe::Trait for Runtime {
+impl pallet_babe::Config for Runtime {
 	type EpochDuration = EpochDuration;
 	type ExpectedBlockTime = ExpectedBlockTime;
 	// there is no actual runtime in this test-runtime, so testing crates
diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs
index 818487a89e518..db22a6092c714 100644
--- a/test-utils/runtime/src/system.rs
+++ b/test-utils/runtime/src/system.rs
@@ -32,7 +32,7 @@ use sp_runtime::{
 	},
 };
 use codec::{KeyedVec, Encode, Decode};
-use frame_system::Trait;
+use frame_system::Config;
 use crate::{
 	AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId
 };
@@ -42,11 +42,11 @@ const NONCE_OF: &[u8] = b"nonce:";
 const BALANCE_OF: &[u8] = b"balance:";
 
 decl_module! {
-	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+	pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as TestRuntime {
+	trait Store for Module<T: Config> as TestRuntime {
 		ExtrinsicData: map hasher(blake2_128_concat) u32 => Vec<u8>;
 		// The current block number being processed. Set by `execute_block`.
 		Number get(fn number): Option<BlockNumber>;
diff --git a/utils/frame/frame-utilities-cli/src/module_id.rs b/utils/frame/frame-utilities-cli/src/module_id.rs
index cc76c70d0fa8e..ae26f31ad24f3 100644
--- a/utils/frame/frame-utilities-cli/src/module_id.rs
+++ b/utils/frame/frame-utilities-cli/src/module_id.rs
@@ -64,7 +64,7 @@ impl ModuleIdCmd {
 	/// runs the command
 	pub fn run<R>(&self) -> Result<(), Error>
 		where
-			R: frame_system::Trait,
+			R: frame_system::Config,
 			R::AccountId: Ss58Codec,
 	{
 		if self.id.len() != 8 {
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
index dc87d6185209d..85cb433cb2b32 100644
--- a/utils/frame/rpc/support/src/lib.rs
+++ b/utils/frame/rpc/support/src/lib.rs
@@ -40,11 +40,11 @@ use sc_rpc_api::state::StateClient;
 /// # use codec::Encode;
 /// # use frame_support::{decl_storage, decl_module};
 /// # use substrate_frame_rpc_support::StorageQuery;
-/// # use frame_system::Trait;
+/// # use frame_system::Config;
 /// # use sc_rpc_api::state::StateClient;
 /// #
-/// # // Hash would normally be <TestRuntime as frame_system::Trait>::Hash, but we don't have
-/// # // frame_system::Trait implemented for TestRuntime. Here we just pretend.
+/// # // Hash would normally be <TestRuntime as frame_system::Config>::Hash, but we don't have
+/// # // frame_system::Config implemented for TestRuntime. Here we just pretend.
 /// # type Hash = ();
 /// #
 /// # fn main() -> Result<(), RpcError> {
@@ -54,7 +54,7 @@ use sc_rpc_api::state::StateClient;
 /// # struct TestRuntime;
 /// #
 /// # decl_module! {
-///	#     pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
+///	#     pub struct Module<T: Config> for enum Call where origin: T::Origin {}
 /// # }
 /// #
 /// pub type Loc = (i64, i64, i64);
@@ -62,7 +62,7 @@ use sc_rpc_api::state::StateClient;
 ///
 /// // Note that all fields are marked pub.
 /// decl_storage! {
-///     trait Store for Module<T: Trait> as TestRuntime {
+///     trait Store for Module<T: Config> as TestRuntime {
 ///         pub LastActionId: u64;
 ///         pub Voxels: map hasher(blake2_128_concat) Loc => Block;
 ///         pub Actions: map hasher(blake2_128_concat) u64 => Loc;
@@ -125,7 +125,7 @@ impl<V: FullCodec> StorageQuery<V> {
 
 	/// Send this query over RPC, await the typed result.
 	///
-	/// Hash should be <YourRuntime as frame::Trait>::Hash.
+	/// Hash should be <YourRuntime as frame::Config>::Hash.
 	///
 	/// # Arguments
 	///