diff --git a/Cargo.dev.toml b/Cargo.dev.toml
index dca469f6b..357d6e536 100644
--- a/Cargo.dev.toml
+++ b/Cargo.dev.toml
@@ -15,21 +15,21 @@ members = [
 ]
 
 [patch.crates-io]
-frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
-sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "b7712fed2c58a898f7706e16861d7109c8f585a5" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
+sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "f884296f7436916909025f8b43c4bbf3e60e4c60" }
diff --git a/auction/src/lib.rs b/auction/src/lib.rs
index bf14156d4..307b310dd 100644
--- a/auction/src/lib.rs
+++ b/auction/src/lib.rs
@@ -34,8 +34,8 @@ pub trait WeightInfo {
 	fn on_finalize(c: u32) -> Weight;
 }
 
-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>;
 
 	/// The balance type for bidding
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaybeSerializeDeserialize;
@@ -53,9 +53,9 @@ pub trait Trait: frame_system::Trait {
 
 decl_event!(
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::Balance,
-		<T as Trait>::AuctionId,
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::Balance,
+		<T as Config>::AuctionId,
 	{
 		/// A bid is placed. [auction_id, bidder, bidding_amount]
 		Bid(AuctionId, AccountId, Balance),
@@ -63,7 +63,7 @@ decl_event!(
 );
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Auction {
+	trait Store for Module<T: Config> as Auction {
 		/// Stores on-going and future auctions. Closed auction are removed.
 		pub Auctions get(fn auctions): map hasher(twox_64_concat) T::AuctionId => Option<AuctionInfo<T::AccountId, T::Balance, T::BlockNumber>>;
 
@@ -76,7 +76,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;
@@ -180,7 +180,7 @@ decl_module! {
 
 decl_error! {
 	/// Error for auction module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		AuctionNotExist,
 		AuctionNotStarted,
 		BidNotAccepted,
@@ -189,7 +189,7 @@ decl_error! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn _on_finalize(now: T::BlockNumber) {
 		for (auction_id, _) in <AuctionEndTime<T>>::drain_prefix(&now) {
 			if let Some(auction) = <Auctions<T>>::take(&auction_id) {
@@ -199,7 +199,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> Auction<T::AccountId, T::BlockNumber> for Module<T> {
+impl<T: Config> Auction<T::AccountId, T::BlockNumber> for Module<T> {
 	type AuctionId = T::AuctionId;
 	type Balance = T::Balance;
 
diff --git a/auction/src/mock.rs b/auction/src/mock.rs
index 9e5ba5943..c82ac976f 100644
--- a/auction/src/mock.rs
+++ b/auction/src/mock.rs
@@ -38,7 +38,7 @@ pub type Balance = u64;
 pub type BlockNumber = u64;
 pub type AuctionId = u64;
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = BlockNumber;
@@ -92,7 +92,7 @@ impl AuctionHandler<AccountId, Balance, BlockNumber, AuctionId> for Handler {
 	fn on_auction_ended(_id: AuctionId, _winner: Option<(AccountId, Balance)>) {}
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type Balance = Balance;
 	type AuctionId = AuctionId;
diff --git a/authority/src/lib.rs b/authority/src/lib.rs
index b924d344a..346df6074 100644
--- a/authority/src/lib.rs
+++ b/authority/src/lib.rs
@@ -2,7 +2,7 @@
 //! A module to provide features for governance including dispatch method on
 //! behalf of other accounts and schedule dispatchables.
 //!
-//! - [`Trait`](./trait.Trait.html)
+//! - [`Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -90,7 +90,7 @@ impl<
 }
 
 /// Origin for the authority module.
-pub type Origin<T> = DelayedOrigin<<T as frame_system::Trait>::BlockNumber, <T as Trait>::PalletsOrigin>;
+pub type Origin<T> = DelayedOrigin<<T as frame_system::Config>::BlockNumber, <T as Config>::PalletsOrigin>;
 
 /// Config for orml-authority
 pub trait AuthorityConfig<Origin, PalletsOrigin, BlockNumber> {
@@ -123,44 +123,48 @@ pub trait AsOriginId<Origin, PalletsOrigin> {
 	fn check_dispatch_from(&self, origin: Origin) -> DispatchResult;
 }
 
-type CallOf<T> = <T as Trait>::Call;
+type CallOf<T> = <T as Config>::Call;
 
 /// The schedule task index type.
 pub type ScheduleTaskIndex = u32;
 
 /// orml-authority 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 outer origin type.
-	type Origin: From<DelayedOrigin<Self::BlockNumber, <Self as Trait>::PalletsOrigin>>
-		+ IsType<<Self as frame_system::Trait>::Origin>
+	type Origin: From<DelayedOrigin<Self::BlockNumber, <Self as Config>::PalletsOrigin>>
+		+ IsType<<Self as frame_system::Config>::Origin>
 		+ OriginTrait<PalletsOrigin = Self::PalletsOrigin>;
 
 	/// The caller origin, overarching type of all pallets origins.
-	type PalletsOrigin: Parameter + Into<<Self as frame_system::Trait>::Origin>;
+	type PalletsOrigin: Parameter + Into<<Self as frame_system::Config>::Origin>;
 
 	/// The aggregated call type.
 	type Call: Parameter
-		+ Dispatchable<Origin = <Self as frame_system::Trait>::Origin, PostInfo = PostDispatchInfo>
+		+ Dispatchable<Origin = <Self as frame_system::Config>::Origin, PostInfo = PostDispatchInfo>
 		+ GetDispatchInfo;
 
 	/// The Scheduler.
-	type Scheduler: ScheduleNamed<Self::BlockNumber, <Self as Trait>::Call, Self::PalletsOrigin>;
+	type Scheduler: ScheduleNamed<Self::BlockNumber, <Self as Config>::Call, Self::PalletsOrigin>;
 
 	/// The type represent origin that can be dispatched by other origins.
-	type AsOriginId: Parameter + AsOriginId<<Self as frame_system::Trait>::Origin, Self::PalletsOrigin>;
+	type AsOriginId: Parameter + AsOriginId<<Self as frame_system::Config>::Origin, Self::PalletsOrigin>;
 
 	/// Additional permission config.
-	type AuthorityConfig: AuthorityConfig<<Self as frame_system::Trait>::Origin, Self::PalletsOrigin, Self::BlockNumber>;
+	type AuthorityConfig: AuthorityConfig<
+		<Self as frame_system::Config>::Origin,
+		Self::PalletsOrigin,
+		Self::BlockNumber,
+	>;
 
 	/// Weight information for extrinsics in this module.
 	type WeightInfo: WeightInfo;
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Calculation overflow.
 		Overflow,
 		/// Failed to schedule a task.
@@ -175,7 +179,7 @@ decl_error! {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Authority {
+	trait Store for Module<T: Config> as Authority {
 		/// Track the next task ID.
 		pub NextTaskIndex get(fn next_task_index): ScheduleTaskIndex;
 	}
@@ -183,8 +187,8 @@ decl_storage! {
 
 decl_event! {
 	pub enum Event<T> where
-		<T as Trait>::PalletsOrigin,
-		<T as frame_system::Trait>::BlockNumber,
+		<T as Config>::PalletsOrigin,
+		<T as frame_system::Config>::BlockNumber,
 	{
 		/// A call is dispatched. [result]
 		Dispatched(DispatchResult),
@@ -200,7 +204,7 @@ decl_event! {
 }
 
 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 {
 		type Error = Error<T>;
 
 		fn deposit_event() = default;
@@ -245,14 +249,14 @@ decl_module! {
 			};
 
 			let schedule_origin = if with_delayed_origin {
-				let origin: <T as Trait>::Origin = From::from(origin);
-				let origin: <T as Trait>::Origin = From::from(DelayedOrigin::<T::BlockNumber, T::PalletsOrigin> {
+				let origin: <T as Config>::Origin = From::from(origin);
+				let origin: <T as Config>::Origin = From::from(DelayedOrigin::<T::BlockNumber, T::PalletsOrigin> {
 					delay,
 					origin: Box::new(origin.caller().clone())
 				});
 				origin
 			} else {
-				<T as Trait>::Origin::from(origin)
+				<T as Config>::Origin::from(origin)
 			};
 
 			let pallets_origin = schedule_origin.caller().clone();
diff --git a/authority/src/mock.rs b/authority/src/mock.rs
index b9064560e..d0f6723b9 100644
--- a/authority/src/mock.rs
+++ b/authority/src/mock.rs
@@ -27,7 +27,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = BlockNumber;
@@ -58,7 +58,7 @@ impl frame_system::Trait for Runtime {
 parameter_types! {
 	pub MaximumSchedulerWeight: u32 = Perbill::from_percent(80) * MaximumBlockWeight::get();
 }
-impl pallet_scheduler::Trait for Runtime {
+impl pallet_scheduler::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type PalletsOrigin = OriginCaller;
@@ -144,7 +144,7 @@ impl AsOriginId<Origin, OriginCaller> for MockAsOriginId {
 	}
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type PalletsOrigin = OriginCaller;
diff --git a/authority/src/tests.rs b/authority/src/tests.rs
index a1c18d5d4..db11f88e4 100644
--- a/authority/src/tests.rs
+++ b/authority/src/tests.rs
@@ -195,9 +195,9 @@ fn fast_track_scheduled_dispatch_work() {
 		assert!(System::events().iter().any(|record| record.event == event));
 
 		let schedule_origin = {
-			let origin: <Runtime as Trait>::Origin = From::from(Origin::root());
-			let origin: <Runtime as Trait>::Origin =
-				From::from(DelayedOrigin::<BlockNumber, <Runtime as Trait>::PalletsOrigin> {
+			let origin: <Runtime as Config>::Origin = From::from(Origin::root());
+			let origin: <Runtime as Config>::Origin =
+				From::from(DelayedOrigin::<BlockNumber, <Runtime as Config>::PalletsOrigin> {
 					delay: 1,
 					origin: Box::new(origin.caller().clone()),
 				});
@@ -269,9 +269,9 @@ fn delay_scheduled_dispatch_work() {
 		assert!(System::events().iter().any(|record| record.event == event));
 
 		let schedule_origin = {
-			let origin: <Runtime as Trait>::Origin = From::from(Origin::root());
-			let origin: <Runtime as Trait>::Origin =
-				From::from(DelayedOrigin::<BlockNumber, <Runtime as Trait>::PalletsOrigin> {
+			let origin: <Runtime as Config>::Origin = From::from(Origin::root());
+			let origin: <Runtime as Config>::Origin =
+				From::from(DelayedOrigin::<BlockNumber, <Runtime as Config>::PalletsOrigin> {
 					delay: 1,
 					origin: Box::new(origin.caller().clone()),
 				});
@@ -342,9 +342,9 @@ fn cancel_scheduled_dispatch_work() {
 		assert!(System::events().iter().any(|record| record.event == event));
 
 		let schedule_origin = {
-			let origin: <Runtime as Trait>::Origin = From::from(Origin::root());
-			let origin: <Runtime as Trait>::Origin =
-				From::from(DelayedOrigin::<BlockNumber, <Runtime as Trait>::PalletsOrigin> {
+			let origin: <Runtime as Config>::Origin = From::from(Origin::root());
+			let origin: <Runtime as Config>::Origin =
+				From::from(DelayedOrigin::<BlockNumber, <Runtime as Config>::PalletsOrigin> {
 					delay: 1,
 					origin: Box::new(origin.caller().clone()),
 				});
diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs
index a4674bae4..b96817095 100644
--- a/benchmarking/src/lib.rs
+++ b/benchmarking/src/lib.rs
@@ -127,7 +127,7 @@ pub use sp_runtime::traits::Zero;
 /// 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
+/// 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.
@@ -813,7 +813,7 @@ macro_rules! impl_benchmark {
 				let mut whitelist = whitelist.to_vec();
 				let whitelisted_caller_key =
 					<frame_system::Account::<$runtime> as frame_support::storage::StorageMap<_,_>>::hashed_key_for(
-						$crate::whitelisted_caller::<<$runtime as frame_system::Trait>::AccountId>()
+						$crate::whitelisted_caller::<<$runtime as frame_system::Config>::AccountId>()
 					);
 				whitelist.push(whitelisted_caller_key.into());
 				$crate::benchmarking::set_whitelist(whitelist);
diff --git a/benchmarking/src/tests.rs b/benchmarking/src/tests.rs
index 1261ceb7c..368d6d0b0 100644
--- a/benchmarking/src/tests.rs
+++ b/benchmarking/src/tests.rs
@@ -15,13 +15,13 @@ use sp_runtime::{
 use sp_std::prelude::*;
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Test {
+	trait Store for Module<T: Config> as Test {
 		Value get(fn value): Option<u32>;
 	}
 }
 
 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 set_value(origin, n: u32) -> DispatchResult {
 			let _sender = ensure_signed(origin)?;
@@ -41,7 +41,7 @@ impl_outer_origin! {
 	pub enum Origin for Test {}
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	type Event;
 	type BlockNumber;
 }
@@ -51,7 +51,7 @@ type AccountId = u128;
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = u64;
@@ -79,7 +79,7 @@ impl frame_system::Trait for Test {
 	type SystemWeightInfo = ();
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = ();
 	type BlockNumber = u32;
 }
diff --git a/currencies/README.md b/currencies/README.md
index e38897ef8..c4a330b5e 100644
--- a/currencies/README.md
+++ b/currencies/README.md
@@ -6,4 +6,4 @@ The currencies module provides a mixed currencies system, by configuring a nativ
 
 It also provides an adapter, to adapt `frame_support::traits::Currency` implementations into `BasicCurrencyExtended`.
 
-The currencies module provides functionality of both `MultiCurrencyExtended` and `BasicCurrencyExtended`, via unified interfaces, and all calls would be delegated to the underlying multi-currency and base currency system. A native currency ID could be set by `Trait::GetNativeCurrencyId`, to identify the native currency.
+The currencies module provides functionality of both `MultiCurrencyExtended` and `BasicCurrencyExtended`, via unified interfaces, and all calls would be delegated to the underlying multi-currency and base currency system. A native currency ID could be set by `Config::GetNativeCurrencyId`, to identify the native currency.
diff --git a/currencies/src/lib.rs b/currencies/src/lib.rs
index 3c4a245be..53f7465bd 100644
--- a/currencies/src/lib.rs
+++ b/currencies/src/lib.rs
@@ -12,7 +12,7 @@
 //! The currencies module provides functionality of both `MultiCurrencyExtended`
 //! and `BasicCurrencyExtended`, via unified interfaces, and all calls would be
 //! delegated to the underlying multi-currency and base currency system.
-//! A native currency ID could be set by `Trait::GetNativeCurrencyId`, to
+//! A native currency ID could be set by `Config::GetNativeCurrencyId`, to
 //! identify the native currency.
 //!
 //! ### Implementations
@@ -32,7 +32,7 @@
 //!   currency.
 //! - `transfer_native_currency` - Transfer some balance to another account, in
 //!   native currency set in
-//! `Trait::NativeCurrency`.
+//! `Config::NativeCurrency`.
 //! - `update_balance` - Update balance by signed integer amount, in a given
 //!   currency, root origin required.
 
@@ -78,15 +78,15 @@ pub trait WeightInfo {
 	fn update_balance_native_currency_killing() -> Weight;
 }
 
-type BalanceOf<T> = <<T as Trait>::MultiCurrency as MultiCurrency<<T as frame_system::Trait>::AccountId>>::Balance;
+type BalanceOf<T> = <<T as Config>::MultiCurrency as MultiCurrency<<T as frame_system::Config>::AccountId>>::Balance;
 type CurrencyIdOf<T> =
-	<<T as Trait>::MultiCurrency as MultiCurrency<<T as frame_system::Trait>::AccountId>>::CurrencyId;
+	<<T as Config>::MultiCurrency as MultiCurrency<<T as frame_system::Config>::AccountId>>::CurrencyId;
 
 type AmountOf<T> =
-	<<T as Trait>::MultiCurrency as MultiCurrencyExtended<<T as frame_system::Trait>::AccountId>>::Amount;
+	<<T as Config>::MultiCurrency as MultiCurrencyExtended<<T as frame_system::Config>::AccountId>>::Amount;
 
-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>;
 	type MultiCurrency: MergeAccount<Self::AccountId>
 		+ MultiCurrencyExtended<Self::AccountId>
 		+ MultiLockableCurrency<Self::AccountId>
@@ -101,12 +101,12 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Currencies {}
+	trait Store for Module<T: Config> as Currencies {}
 }
 
 decl_event!(
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 		Amount = AmountOf<T>,
 		Balance = BalanceOf<T>,
 		CurrencyId = CurrencyIdOf<T>
@@ -124,7 +124,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for currencies module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Unable to convert the Amount type into Balance.
 		AmountIntoBalanceFailed,
 		/// Balance is too low.
@@ -133,7 +133,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>;
 
 		const NativeCurrencyId: CurrencyIdOf<T> = T::GetNativeCurrencyId::get();
@@ -228,9 +228,9 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {}
+impl<T: Config> Module<T> {}
 
-impl<T: Trait> MultiCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiCurrency<T::AccountId> for Module<T> {
 	type CurrencyId = CurrencyIdOf<T>;
 	type Balance = BalanceOf<T>;
 
@@ -335,7 +335,7 @@ impl<T: Trait> MultiCurrency<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> MultiCurrencyExtended<T::AccountId> for Module<T> {
+impl<T: Config> MultiCurrencyExtended<T::AccountId> for Module<T> {
 	type Amount = AmountOf<T>;
 
 	fn update_balance(currency_id: Self::CurrencyId, who: &T::AccountId, by_amount: Self::Amount) -> DispatchResult {
@@ -349,7 +349,7 @@ impl<T: Trait> MultiCurrencyExtended<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> MultiLockableCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiLockableCurrency<T::AccountId> for Module<T> {
 	type Moment = T::BlockNumber;
 
 	fn set_lock(lock_id: LockIdentifier, currency_id: Self::CurrencyId, who: &T::AccountId, amount: Self::Balance) {
@@ -377,7 +377,7 @@ impl<T: Trait> MultiLockableCurrency<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> MultiReservableCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiReservableCurrency<T::AccountId> for Module<T> {
 	fn can_reserve(currency_id: Self::CurrencyId, who: &T::AccountId, value: Self::Balance) -> bool {
 		if currency_id == T::GetNativeCurrencyId::get() {
 			T::NativeCurrency::can_reserve(who, value)
@@ -437,7 +437,7 @@ pub struct Currency<T, GetCurrencyId>(marker::PhantomData<T>, marker::PhantomDat
 
 impl<T, GetCurrencyId> BasicCurrency<T::AccountId> for Currency<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<CurrencyIdOf<T>>,
 {
 	type Balance = BalanceOf<T>;
@@ -485,7 +485,7 @@ where
 
 impl<T, GetCurrencyId> BasicCurrencyExtended<T::AccountId> for Currency<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<CurrencyIdOf<T>>,
 {
 	type Amount = AmountOf<T>;
@@ -497,7 +497,7 @@ where
 
 impl<T, GetCurrencyId> BasicLockableCurrency<T::AccountId> for Currency<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<CurrencyIdOf<T>>,
 {
 	type Moment = T::BlockNumber;
@@ -517,7 +517,7 @@ where
 
 impl<T, GetCurrencyId> BasicReservableCurrency<T::AccountId> for Currency<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<CurrencyIdOf<T>>,
 {
 	fn can_reserve(who: &T::AccountId, value: Self::Balance) -> bool {
@@ -556,7 +556,7 @@ where
 	}
 }
 
-pub type NativeCurrencyOf<T> = Currency<T, <T as Trait>::GetNativeCurrencyId>;
+pub type NativeCurrencyOf<T> = Currency<T, <T as Config>::GetNativeCurrencyId>;
 
 /// Adapt other currency traits implementation to `BasicCurrency`.
 pub struct BasicCurrencyAdapter<T, Currency, Amount, Moment>(marker::PhantomData<(T, Currency, Amount, Moment)>);
@@ -568,7 +568,7 @@ impl<T, AccountId, Currency, Amount, Moment> BasicCurrency<AccountId>
 	for BasicCurrencyAdapter<T, Currency, Amount, Moment>
 where
 	Currency: PalletCurrency<AccountId>,
-	T: Trait,
+	T: Config,
 {
 	type Balance = PalletBalanceOf<AccountId, Currency>;
 
@@ -633,7 +633,7 @@ where
 		+ Debug
 		+ Default,
 	Currency: PalletCurrency<AccountId>,
-	T: Trait,
+	T: Config,
 {
 	type Amount = Amount;
 
@@ -655,7 +655,7 @@ impl<T, AccountId, Currency, Amount, Moment> BasicLockableCurrency<AccountId>
 	for BasicCurrencyAdapter<T, Currency, Amount, Moment>
 where
 	Currency: PalletLockableCurrency<AccountId>,
-	T: Trait,
+	T: Config,
 {
 	type Moment = Moment;
 
@@ -677,7 +677,7 @@ impl<T, AccountId, Currency, Amount, Moment> BasicReservableCurrency<AccountId>
 	for BasicCurrencyAdapter<T, Currency, Amount, Moment>
 where
 	Currency: PalletReservableCurrency<AccountId>,
-	T: Trait,
+	T: Config,
 {
 	fn can_reserve(who: &AccountId, value: Self::Balance) -> bool {
 		Currency::can_reserve(who, value)
@@ -710,7 +710,7 @@ where
 	}
 }
 
-impl<T: Trait> MergeAccount<T::AccountId> for Module<T> {
+impl<T: Config> MergeAccount<T::AccountId> for Module<T> {
 	fn merge_account(source: &T::AccountId, dest: &T::AccountId) -> DispatchResult {
 		with_transaction_result(|| {
 			// transfer non-native free to dest
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
index 2fa29655e..f85659754 100644
--- a/currencies/src/mock.rs
+++ b/currencies/src/mock.rs
@@ -42,7 +42,7 @@ parameter_types! {
 }
 
 pub type AccountId = AccountId32;
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Call = ();
 	type Index = u64;
@@ -78,7 +78,7 @@ parameter_types! {
 	pub const ExistentialDeposit: u64 = 1;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	type Balance = Balance;
 	type DustRemoval = ();
 	type Event = TestEvent;
@@ -99,7 +99,7 @@ parameter_types! {
 	pub DustAccount: AccountId = ModuleId(*b"orml/dst").into_account();
 }
 
-impl orml_tokens::Trait for Runtime {
+impl orml_tokens::Config for Runtime {
 	type Event = TestEvent;
 	type Balance = Balance;
 	type Amount = i64;
@@ -117,7 +117,7 @@ parameter_types! {
 	pub const GetNativeCurrencyId: CurrencyId = NATIVE_CURRENCY_ID;
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type MultiCurrency = Tokens;
 	type NativeCurrency = AdaptedBasicCurrency;
diff --git a/gradually-update/src/lib.rs b/gradually-update/src/lib.rs
index 616558a4c..11424a791 100644
--- a/gradually-update/src/lib.rs
+++ b/gradually-update/src/lib.rs
@@ -1,7 +1,7 @@
 //! # Gradually Update
 //! A module for scheduling gradually updates to storage values.
 //!
-//! - [`Trait`](./trait.Trait.html)
+//! - [`Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -56,8 +56,8 @@ pub struct GraduallyUpdate {
 	pub per_block: StorageValue,
 }
 
-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>;
 	/// The frequency of updating values between blocks
 	type UpdateFrequency: Get<Self::BlockNumber>;
 	/// The origin that can schedule an update
@@ -67,7 +67,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as GraduallyUpdate {
+	trait Store for Module<T: Config> as GraduallyUpdate {
 		/// All the on-going updates
 		pub GraduallyUpdates get(fn gradually_updates): Vec<GraduallyUpdate>;
 		/// The last updated block number
@@ -78,7 +78,7 @@ decl_storage! {
 decl_event!(
 	/// Event for gradually-update module.
 	pub enum Event<T> where
-	<T as frame_system::Trait>::BlockNumber,
+	<T as frame_system::Config>::BlockNumber,
 	{
 		/// Gradually update added. [key, per_block, target_value]
 		GraduallyUpdateAdded(StorageKey, StorageValue, StorageValue),
@@ -91,7 +91,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for gradually-update module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The `per_block` or `target_value` is invalid.
 		InvalidPerBlockOrTargetValue,
 		/// The `target_value` is invalid.
@@ -104,7 +104,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;
@@ -169,7 +169,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn _need_update(now: T::BlockNumber) -> bool {
 		now >= Self::last_updated_at() + T::UpdateFrequency::get()
 	}
diff --git a/gradually-update/src/mock.rs b/gradually-update/src/mock.rs
index 3e350d149..ed5c965e7 100644
--- a/gradually-update/src/mock.rs
+++ b/gradually-update/src/mock.rs
@@ -37,7 +37,7 @@ parameter_types! {
 pub type AccountId = u128;
 pub type BlockNumber = u64;
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = BlockNumber;
@@ -70,7 +70,7 @@ parameter_types! {
 	pub const UpdateFrequency: BlockNumber = 10;
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type UpdateFrequency = UpdateFrequency;
 	type DispatchOrigin = system::EnsureRoot<AccountId>;
diff --git a/nft/src/lib.rs b/nft/src/lib.rs
index a7a8e8167..63864aa57 100644
--- a/nft/src/lib.rs
+++ b/nft/src/lib.rs
@@ -1,7 +1,7 @@
 //! # Non Fungible Token
 //! The module provides implementations for non-fungible-token.
 //!
-//! - [`Trait`](./trait.Trait.html)
+//! - [`Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -55,7 +55,7 @@ pub struct TokenInfo<AccountId, Data> {
 	pub data: Data,
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The class ID type
 	type ClassId: Parameter + Member + AtLeast32BitUnsigned + Default + Copy;
 	/// The token ID type
@@ -68,7 +68,7 @@ pub trait Trait: frame_system::Trait {
 
 decl_error! {
 	/// Error for non-fungible-token module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// No available class ID
 		NoAvailableClassId,
 		/// No available token ID
@@ -88,11 +88,11 @@ decl_error! {
 }
 
 pub type ClassInfoOf<T> =
-	ClassInfo<<T as Trait>::TokenId, <T as frame_system::Trait>::AccountId, <T as Trait>::ClassData>;
-pub type TokenInfoOf<T> = TokenInfo<<T as frame_system::Trait>::AccountId, <T as Trait>::TokenData>;
+	ClassInfo<<T as Config>::TokenId, <T as frame_system::Config>::AccountId, <T as Config>::ClassData>;
+pub type TokenInfoOf<T> = TokenInfo<<T as frame_system::Config>::AccountId, <T as Config>::TokenData>;
 
 decl_storage! {
-	trait Store for Module<T: Trait> as NonFungibleToken {
+	trait Store for Module<T: Config> as NonFungibleToken {
 		/// Next available class ID.
 		pub NextClassId get(fn next_class_id): T::ClassId;
 		/// Next available token ID.
@@ -112,11 +112,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> {
 	/// Create NFT(non fungible token) class
 	pub fn create_class(
 		owner: &T::AccountId,
diff --git a/nft/src/mock.rs b/nft/src/mock.rs
index 7fb69b5b7..bef77445d 100644
--- a/nft/src/mock.rs
+++ b/nft/src/mock.rs
@@ -25,7 +25,7 @@ parameter_types! {
 pub type AccountId = u128;
 pub type BlockNumber = u64;
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = BlockNumber;
@@ -54,7 +54,7 @@ impl frame_system::Trait for Runtime {
 }
 pub type System = frame_system::Module<Runtime>;
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type ClassId = u64;
 	type TokenId = u64;
 	type ClassData = ();
@@ -64,10 +64,10 @@ pub type NonFungibleTokenModule = Module<Runtime>;
 
 pub const ALICE: AccountId = 1;
 pub const BOB: AccountId = 2;
-pub const CLASS_ID: <Runtime as Trait>::ClassId = 0;
-pub const CLASS_ID_NOT_EXIST: <Runtime as Trait>::ClassId = 100;
-pub const TOKEN_ID: <Runtime as Trait>::TokenId = 0;
-pub const TOKEN_ID_NOT_EXIST: <Runtime as Trait>::TokenId = 100;
+pub const CLASS_ID: <Runtime as Config>::ClassId = 0;
+pub const CLASS_ID_NOT_EXIST: <Runtime as Config>::ClassId = 100;
+pub const TOKEN_ID: <Runtime as Config>::TokenId = 0;
+pub const TOKEN_ID_NOT_EXIST: <Runtime as Config>::TokenId = 100;
 
 pub struct ExtBuilder;
 
diff --git a/nft/src/tests.rs b/nft/src/tests.rs
index 720829284..63faa99d7 100644
--- a/nft/src/tests.rs
+++ b/nft/src/tests.rs
@@ -18,7 +18,7 @@ fn create_class_should_work() {
 #[test]
 fn create_class_should_fail() {
 	ExtBuilder::default().build().execute_with(|| {
-		NextClassId::<Runtime>::mutate(|id| *id = <Runtime as Trait>::ClassId::max_value());
+		NextClassId::<Runtime>::mutate(|id| *id = <Runtime as Config>::ClassId::max_value());
 		assert_noop!(
 			NonFungibleTokenModule::create_class(&ALICE, vec![1], ()),
 			Error::<Runtime>::NoAvailableClassId
@@ -53,14 +53,14 @@ fn mint_should_fail() {
 	ExtBuilder::default().build().execute_with(|| {
 		assert_ok!(NonFungibleTokenModule::create_class(&ALICE, vec![1], ()));
 		Classes::<Runtime>::mutate(CLASS_ID, |class_info| {
-			class_info.as_mut().unwrap().total_issuance = <Runtime as Trait>::TokenId::max_value();
+			class_info.as_mut().unwrap().total_issuance = <Runtime as Config>::TokenId::max_value();
 		});
 		assert_noop!(
 			NonFungibleTokenModule::mint(&BOB, CLASS_ID, vec![1], ()),
 			Error::<Runtime>::NumOverflow
 		);
 
-		NextTokenId::<Runtime>::mutate(CLASS_ID, |id| *id = <Runtime as Trait>::TokenId::max_value());
+		NextTokenId::<Runtime>::mutate(CLASS_ID, |id| *id = <Runtime as Config>::TokenId::max_value());
 		assert_noop!(
 			NonFungibleTokenModule::mint(&BOB, CLASS_ID, vec![1], ()),
 			Error::<Runtime>::NoAvailableTokenId
diff --git a/oracle/src/default_combine_data.rs b/oracle/src/default_combine_data.rs
index 56cf6b8cc..5c097e495 100644
--- a/oracle/src/default_combine_data.rs
+++ b/oracle/src/default_combine_data.rs
@@ -1,4 +1,4 @@
-use crate::{DefaultInstance, Instance, MomentOf, TimestampedValueOf, Trait};
+use crate::{Config, DefaultInstance, Instance, MomentOf, TimestampedValueOf};
 use frame_support::traits::{Get, Time};
 use orml_traits::CombineData;
 use sp_std::{marker, prelude::*};
@@ -9,16 +9,16 @@ pub struct DefaultCombineData<T, MinimumCount, ExpiresIn, I = DefaultInstance>(
 	marker::PhantomData<(T, I, MinimumCount, ExpiresIn)>,
 );
 
-impl<T, I, MinimumCount, ExpiresIn> CombineData<<T as Trait<I>>::OracleKey, TimestampedValueOf<T, I>>
+impl<T, I, MinimumCount, ExpiresIn> CombineData<<T as Config<I>>::OracleKey, TimestampedValueOf<T, I>>
 	for DefaultCombineData<T, MinimumCount, ExpiresIn, I>
 where
-	T: Trait<I>,
+	T: Config<I>,
 	I: Instance,
 	MinimumCount: Get<u32>,
 	ExpiresIn: Get<MomentOf<T, I>>,
 {
 	fn combine_data(
-		_key: &<T as Trait<I>>::OracleKey,
+		_key: &<T as Config<I>>::OracleKey,
 		mut values: Vec<TimestampedValueOf<T, I>>,
 		prev_value: Option<TimestampedValueOf<T, I>>,
 	) -> Option<TimestampedValueOf<T, I>> {
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
index 797fa8249..6a34b7507 100644
--- a/oracle/src/lib.rs
+++ b/oracle/src/lib.rs
@@ -1,7 +1,7 @@
 //! # Oracle
 //! A module to allow oracle operators to feed external data.
 //!
-//! - [`Trait`](./trait.Trait.html)
+//! - [`Config`](./trait.Config.html)
 //! - [`Call`](./enum.Call.html)
 //! - [`Module`](./struct.Module.html)
 //!
@@ -48,8 +48,8 @@ use serde::{Deserialize, Serialize};
 use sp_runtime::{traits::Member, DispatchResult, RuntimeDebug};
 use sp_std::{prelude::*, vec};
 
-type MomentOf<T, I = DefaultInstance> = <<T as Trait<I>>::Time as Time>::Moment;
-pub type TimestampedValueOf<T, I = DefaultInstance> = TimestampedValue<<T as Trait<I>>::OracleValue, MomentOf<T, I>>;
+type MomentOf<T, I = DefaultInstance> = <<T as Config<I>>::Time as Time>::Moment;
+pub type TimestampedValueOf<T, I = DefaultInstance> = TimestampedValue<<T as Config<I>>::OracleValue, MomentOf<T, I>>;
 
 #[derive(Encode, Decode, RuntimeDebug, Eq, PartialEq, Clone, Copy, Ord, PartialOrd)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
@@ -58,8 +58,8 @@ pub struct TimestampedValue<Value, Moment> {
 	pub timestamp: Moment,
 }
 
-pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
-	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
+pub trait Config<I: Instance = DefaultInstance>: frame_system::Config {
+	type Event: From<Event<Self, I>> + Into<<Self as frame_system::Config>::Event>;
 
 	/// Hook on new data received
 	type OnNewData: OnNewData<Self::AccountId, Self::OracleKey, Self::OracleValue>;
@@ -85,7 +85,7 @@ pub trait Trait<I: Instance = DefaultInstance>: frame_system::Trait {
 }
 
 decl_error! {
-	pub enum Error for Module<T: Trait<I>, I: Instance> {
+	pub enum Error for Module<T: Config<I>, I: Instance> {
 		/// Sender does not have permission
 		NoPermission,
 		/// Feeder has already feeded at this block
@@ -95,9 +95,9 @@ decl_error! {
 
 decl_event!(
 	pub enum Event<T, I=DefaultInstance> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait<I>>::OracleKey,
-		<T as Trait<I>>::OracleValue,
+		<T as frame_system::Config>::AccountId,
+		<T as Config<I>>::OracleKey,
+		<T as Config<I>>::OracleValue,
 	{
 		/// New feed data is submitted. [sender, values]
 		NewFeedData(AccountId, Vec<(OracleKey, OracleValue)>),
@@ -105,16 +105,16 @@ decl_event!(
 );
 
 decl_storage! {
-	trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Oracle {
+	trait Store for Module<T: Config<I>, I: Instance=DefaultInstance> as Oracle {
 
 		/// Raw values for each oracle operators
 		pub RawValues get(fn raw_values): double_map hasher(twox_64_concat) T::AccountId, hasher(twox_64_concat) T::OracleKey => Option<TimestampedValueOf<T, I>>;
 
 		/// True if Self::values(key) is up to date, otherwise the value is stale
-		pub IsUpdated get(fn is_updated): map hasher(twox_64_concat) <T as Trait<I>>::OracleKey => bool;
+		pub IsUpdated get(fn is_updated): map hasher(twox_64_concat) <T as Config<I>>::OracleKey => bool;
 
 		/// Combined value, may not be up to date
-		pub Values get(fn values): map hasher(twox_64_concat) <T as Trait<I>>::OracleKey => Option<TimestampedValueOf<T, I>>;
+		pub Values get(fn values): map hasher(twox_64_concat) <T as Config<I>>::OracleKey => Option<TimestampedValueOf<T, I>>;
 
 		/// If an oracle operator has feed a value in this block
 		HasDispatched: OrderedSet<T::AccountId>;
@@ -132,7 +132,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>;
 
 		fn deposit_event() = default;
@@ -162,7 +162,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> Module<T, I> {
+impl<T: Config<I>, I: Instance> Module<T, I> {
 	pub fn read_raw_values(key: &T::OracleKey) -> Vec<TimestampedValueOf<T, I>> {
 		Self::members()
 			.0
@@ -242,7 +242,7 @@ impl<T: Trait<I>, I: Instance> 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().0.is_empty(), "Members are already initialized!");
@@ -251,7 +251,7 @@ impl<T: Trait<I>, I: Instance> InitializeMembers<T::AccountId> for 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> {
 	fn change_members_sorted(_incoming: &[T::AccountId], outgoing: &[T::AccountId], new: &[T::AccountId]) {
 		// remove session keys and its values
 		for removed in outgoing {
@@ -269,12 +269,12 @@ impl<T: Trait<I>, I: Instance> ChangeMembers<T::AccountId> for Module<T, I> {
 	}
 }
 
-impl<T: Trait<I>, I: Instance> DataProvider<T::OracleKey, T::OracleValue> for Module<T, I> {
+impl<T: Config<I>, I: Instance> DataProvider<T::OracleKey, T::OracleValue> for Module<T, I> {
 	fn get(key: &T::OracleKey) -> Option<T::OracleValue> {
 		Self::get(key).map(|timestamped_value| timestamped_value.value)
 	}
 }
-impl<T: Trait<I>, I: Instance> DataProviderExtended<T::OracleKey, TimestampedValueOf<T, I>> for Module<T, I> {
+impl<T: Config<I>, I: Instance> DataProviderExtended<T::OracleKey, TimestampedValueOf<T, I>> for Module<T, I> {
 	fn get_no_op(key: &T::OracleKey) -> Option<TimestampedValueOf<T, I>> {
 		Self::get_no_op(key)
 	}
@@ -284,7 +284,7 @@ impl<T: Trait<I>, I: Instance> DataProviderExtended<T::OracleKey, TimestampedVal
 	}
 }
 
-impl<T: Trait<I>, I: Instance> DataFeeder<T::OracleKey, T::OracleValue, T::AccountId> for Module<T, I> {
+impl<T: Config<I>, I: Instance> DataFeeder<T::OracleKey, T::OracleValue, T::AccountId> for Module<T, I> {
 	fn feed_value(who: T::AccountId, key: T::OracleKey, value: T::OracleValue) -> DispatchResult {
 		Self::do_feed_values(who, vec![(key, value)])?;
 		Ok(())
diff --git a/oracle/src/mock.rs b/oracle/src/mock.rs
index 0f9c380aa..b0db22883 100644
--- a/oracle/src/mock.rs
+++ b/oracle/src/mock.rs
@@ -48,7 +48,7 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 }
-impl frame_system::Trait for Test {
+impl frame_system::Config for Test {
 	type Origin = Origin;
 	type Call = Call;
 	type Index = u64;
@@ -102,7 +102,7 @@ parameter_types! {
 	pub const RootOperatorAccountId: AccountId = 4;
 }
 
-impl Trait for Test {
+impl Config for Test {
 	type Event = TestEvent;
 	type OnNewData = ();
 	type CombineData = DefaultCombineData<Self, MinimumCount, ExpiresIn>;
diff --git a/rewards/src/lib.rs b/rewards/src/lib.rs
index 48053b3bf..43e8cecf5 100644
--- a/rewards/src/lib.rs
+++ b/rewards/src/lib.rs
@@ -34,7 +34,7 @@ pub struct PoolInfo<Share: HasCompact, Balance: HasCompact> {
 	pub total_withdrawn_rewards: Balance,
 }
 
-pub trait Trait: frame_system::Trait {
+pub trait Config: frame_system::Config {
 	/// The share type of pool.
 	type Share: Parameter
 		+ Member
@@ -72,7 +72,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Rewards {
+	trait Store for Module<T: Config> as Rewards {
 		/// Stores reward pool info.
 		pub Pools get(fn pools): map hasher(twox_64_concat) T::PoolId => PoolInfo<T::Share, T::Balance>;
 
@@ -82,7 +82,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 {
 
 		fn on_initialize(now: T::BlockNumber) -> Weight {
 			let mut count = 0;
@@ -97,7 +97,7 @@ decl_module! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	pub fn add_share(who: &T::AccountId, pool: T::PoolId, add_amount: T::Share) {
 		if add_amount.is_zero() {
 			return;
diff --git a/rewards/src/mock.rs b/rewards/src/mock.rs
index 104732134..61fa057ab 100644
--- a/rewards/src/mock.rs
+++ b/rewards/src/mock.rs
@@ -38,7 +38,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Index = u64;
 	type BlockNumber = BlockNumber;
@@ -113,7 +113,7 @@ impl RewardHandler<AccountId, BlockNumber> for Handler {
 	}
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Share = Share;
 	type Balance = Balance;
 	type PoolId = PoolId;
diff --git a/tokens/src/imbalances.rs b/tokens/src/imbalances.rs
index 5c6a857aa..49395e92c 100644
--- a/tokens/src/imbalances.rs
+++ b/tokens/src/imbalances.rs
@@ -1,6 +1,6 @@
 // wrapping these imbalances in a private module is necessary to ensure absolute
 // privacy of the inner member.
-use crate::{TotalIssuance, Trait};
+use crate::{Config, TotalIssuance};
 use frame_support::storage::StorageMap;
 use frame_support::traits::{Get, Imbalance, TryDrop};
 use sp_runtime::traits::{Saturating, Zero};
@@ -10,12 +10,12 @@ use sp_std::{marker, mem, result};
 /// denoting that funds have been created without any equal and opposite
 /// accounting.
 #[must_use]
-pub struct PositiveImbalance<T: Trait, GetCurrencyId: Get<T::CurrencyId>>(
+pub struct PositiveImbalance<T: Config, GetCurrencyId: Get<T::CurrencyId>>(
 	T::Balance,
 	marker::PhantomData<GetCurrencyId>,
 );
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> PositiveImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> PositiveImbalance<T, GetCurrencyId> {
 	/// Create a new positive imbalance from a balance.
 	pub fn new(amount: T::Balance) -> Self {
 		PositiveImbalance(amount, marker::PhantomData::<GetCurrencyId>)
@@ -26,25 +26,25 @@ impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> PositiveImbalance<T, GetCurren
 /// denoting that funds have been destroyed without any equal and opposite
 /// accounting.
 #[must_use]
-pub struct NegativeImbalance<T: Trait, GetCurrencyId: Get<T::CurrencyId>>(
+pub struct NegativeImbalance<T: Config, GetCurrencyId: Get<T::CurrencyId>>(
 	T::Balance,
 	marker::PhantomData<GetCurrencyId>,
 );
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> NegativeImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> NegativeImbalance<T, GetCurrencyId> {
 	/// Create a new negative imbalance from a balance.
 	pub fn new(amount: T::Balance) -> Self {
 		NegativeImbalance(amount, marker::PhantomData::<GetCurrencyId>)
 	}
 }
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> TryDrop for PositiveImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> TryDrop for PositiveImbalance<T, GetCurrencyId> {
 	fn try_drop(self) -> result::Result<(), Self> {
 		self.drop_zero()
 	}
 }
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for PositiveImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for PositiveImbalance<T, GetCurrencyId> {
 	type Opposite = NegativeImbalance<T, GetCurrencyId>;
 
 	fn zero() -> Self {
@@ -89,13 +89,13 @@ impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for Posi
 	}
 }
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> TryDrop for NegativeImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> TryDrop for NegativeImbalance<T, GetCurrencyId> {
 	fn try_drop(self) -> result::Result<(), Self> {
 		self.drop_zero()
 	}
 }
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for NegativeImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for NegativeImbalance<T, GetCurrencyId> {
 	type Opposite = PositiveImbalance<T, GetCurrencyId>;
 
 	fn zero() -> Self {
@@ -140,14 +140,14 @@ impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for Nega
 	}
 }
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> Drop for PositiveImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Drop for PositiveImbalance<T, GetCurrencyId> {
 	/// Basic drop handler will just square up the total issuance.
 	fn drop(&mut self) {
 		<TotalIssuance<T>>::mutate(GetCurrencyId::get(), |v| *v = v.saturating_add(self.0));
 	}
 }
 
-impl<T: Trait, GetCurrencyId: Get<T::CurrencyId>> Drop for NegativeImbalance<T, GetCurrencyId> {
+impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Drop for NegativeImbalance<T, GetCurrencyId> {
 	/// Basic drop handler will just square up the total issuance.
 	fn drop(&mut self) {
 		<TotalIssuance<T>>::mutate(GetCurrencyId::get(), |v| *v = v.saturating_sub(self.0));
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
index de0a45a47..995f71ec8 100644
--- a/tokens/src/lib.rs
+++ b/tokens/src/lib.rs
@@ -88,7 +88,7 @@ pub trait WeightInfo {
 pub struct TransferDust<T, GetAccountId>(marker::PhantomData<(T, GetAccountId)>);
 impl<T, GetAccountId> OnDust<T::AccountId, T::CurrencyId, T::Balance> for TransferDust<T, GetAccountId>
 where
-	T: Trait,
+	T: Config,
 	GetAccountId: Get<T::AccountId>,
 {
 	fn on_dust(who: &T::AccountId, currency_id: T::CurrencyId, amount: T::Balance) {
@@ -99,7 +99,7 @@ where
 }
 
 pub struct BurnDust<T>(marker::PhantomData<T>);
-impl<T: Trait> OnDust<T::AccountId, T::CurrencyId, T::Balance> for BurnDust<T> {
+impl<T: Config> OnDust<T::AccountId, T::CurrencyId, T::Balance> for BurnDust<T> {
 	fn on_dust(who: &T::AccountId, currency_id: T::CurrencyId, amount: T::Balance) {
 		// burn the dust, ignore the result,
 		// if failed will leave some dust which still could be recycled.
@@ -107,8 +107,8 @@ impl<T: Trait> OnDust<T::AccountId, T::CurrencyId, T::Balance> for BurnDust<T> {
 	}
 }
 
-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>;
 
 	/// The balance type
 	type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaybeSerializeDeserialize;
@@ -184,7 +184,7 @@ impl<Balance: Saturating + Copy + Ord> AccountData<Balance> {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Tokens {
+	trait Store for Module<T: Config> as Tokens {
 		/// The total issuance of a token type.
 		pub TotalIssuance get(fn total_issuance) build(|config: &GenesisConfig<T>| {
 			config
@@ -232,9 +232,9 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
-		<T as Trait>::CurrencyId,
-		<T as Trait>::Balance
+		<T as frame_system::Config>::AccountId,
+		<T as Config>::CurrencyId,
+		<T as Config>::Balance
 	{
 		/// Token transfer success. \[currency_id, from, to, amount\]
 		Transferred(CurrencyId, AccountId, AccountId, Balance),
@@ -245,7 +245,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>;
 
 		fn deposit_event() = default;
@@ -304,7 +304,7 @@ decl_module! {
 
 decl_error! {
 	/// Error for token module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// The balance is too low
 		BalanceTooLow,
 		/// This operation will cause balance to overflow
@@ -320,7 +320,7 @@ decl_error! {
 	}
 }
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	/// Check whether account_id is a module account
 	fn is_module_account_id(account_id: &T::AccountId) -> bool {
 		ModuleId::try_from_account(account_id).is_some()
@@ -430,7 +430,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> MultiCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiCurrency<T::AccountId> for Module<T> {
 	type CurrencyId = T::CurrencyId;
 	type Balance = T::Balance;
 
@@ -572,7 +572,7 @@ impl<T: Trait> MultiCurrency<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> MultiCurrencyExtended<T::AccountId> for Module<T> {
+impl<T: Config> MultiCurrencyExtended<T::AccountId> for Module<T> {
 	type Amount = T::Amount;
 
 	fn update_balance(currency_id: Self::CurrencyId, who: &T::AccountId, by_amount: Self::Amount) -> DispatchResult {
@@ -598,7 +598,7 @@ impl<T: Trait> MultiCurrencyExtended<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> MultiLockableCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiLockableCurrency<T::AccountId> for Module<T> {
 	type Moment = T::BlockNumber;
 
 	// Set a lock on the balance of `who` under `currency_id`.
@@ -657,7 +657,7 @@ impl<T: Trait> MultiLockableCurrency<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> MultiReservableCurrency<T::AccountId> for Module<T> {
+impl<T: Config> MultiReservableCurrency<T::AccountId> for Module<T> {
 	/// Check if `who` can reserve `value` from their free balance.
 	///
 	/// Always `true` if value to be reserved is zero.
@@ -767,7 +767,7 @@ pub struct CurrencyAdapter<T, GetCurrencyId>(marker::PhantomData<(T, GetCurrency
 
 impl<T, GetCurrencyId> PalletCurrency<T::AccountId> for CurrencyAdapter<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<T::CurrencyId>,
 {
 	type Balance = T::Balance;
@@ -937,7 +937,7 @@ where
 
 impl<T, GetCurrencyId> PalletReservableCurrency<T::AccountId> for CurrencyAdapter<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<T::CurrencyId>,
 {
 	fn can_reserve(who: &T::AccountId, value: Self::Balance) -> bool {
@@ -973,7 +973,7 @@ where
 
 impl<T, GetCurrencyId> PalletLockableCurrency<T::AccountId> for CurrencyAdapter<T, GetCurrencyId>
 where
-	T: Trait,
+	T: Config,
 	GetCurrencyId: Get<T::CurrencyId>,
 {
 	type Moment = T::BlockNumber;
@@ -992,7 +992,7 @@ where
 	}
 }
 
-impl<T: Trait> MergeAccount<T::AccountId> for Module<T> {
+impl<T: Config> MergeAccount<T::AccountId> for Module<T> {
 	#[transactional]
 	fn merge_account(source: &T::AccountId, dest: &T::AccountId) -> DispatchResult {
 		Accounts::<T>::iter_prefix(source).try_for_each(|(currency_id, account_data)| -> DispatchResult {
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
index 3efd2e39e..be3db4702 100644
--- a/tokens/src/mock.rs
+++ b/tokens/src/mock.rs
@@ -58,7 +58,7 @@ parameter_types! {
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Call = ();
 	type Index = u64;
@@ -134,7 +134,7 @@ parameter_types! {
 	pub const GetTokenId: CurrencyId = DOT;
 }
 
-impl pallet_treasury::Trait for Runtime {
+impl pallet_treasury::Config for Runtime {
 	type ModuleId = TreasuryModuleId;
 	type Currency = CurrencyAdapter<Runtime, GetTokenId>;
 	type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
@@ -252,7 +252,7 @@ parameter_types! {
 	pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
 }
 
-impl pallet_elections_phragmen::Trait for Runtime {
+impl pallet_elections_phragmen::Config for Runtime {
 	type ModuleId = ElectionsPhragmenModuleId;
 	type Event = TestEvent;
 	type Currency = CurrencyAdapter<Runtime, GetTokenId>;
@@ -284,7 +284,7 @@ parameter_types! {
 	pub DustAccount: AccountId = ModuleId(*b"orml/dst").into_account();
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type Balance = Balance;
 	type Amount = i64;
@@ -294,7 +294,7 @@ impl Trait for Runtime {
 	type OnDust = TransferDust<Runtime, DustAccount>;
 }
 pub type Tokens = Module<Runtime>;
-pub type TreasuryCurrencyAdapter = <Runtime as pallet_treasury::Trait>::Currency;
+pub type TreasuryCurrencyAdapter = <Runtime as pallet_treasury::Config>::Currency;
 
 pub struct ExtBuilder {
 	endowed_accounts: Vec<(AccountId, CurrencyId, Balance)>,
diff --git a/tokens/src/tests.rs b/tokens/src/tests.rs
index 29bc64d57..8f4877840 100644
--- a/tokens/src/tests.rs
+++ b/tokens/src/tests.rs
@@ -471,120 +471,120 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			assert_eq!(Tokens::reserved_balance(DOT, &TREASURY_ACCOUNT), 5);
 			assert_eq!(Tokens::free_balance(DOT, &TREASURY_ACCOUNT), 95);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_balance(&TREASURY_ACCOUNT),
 				100
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::can_slash(&TREASURY_ACCOUNT, 10),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::can_slash(&TREASURY_ACCOUNT, 10),
 				true
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				102
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::minimum_balance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::minimum_balance(),
 				2
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::can_reserve(&TREASURY_ACCOUNT, 5),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::can_reserve(&TREASURY_ACCOUNT, 5),
 				true
 			);
 
 			// burn
-			let imbalance = <Runtime as pallet_elections_phragmen::Trait>::Currency::burn(10);
+			let imbalance = <Runtime as pallet_elections_phragmen::Config>::Currency::burn(10);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				92
 			);
 			drop(imbalance);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				102
 			);
 
 			// issue
-			let imbalance = <Runtime as pallet_elections_phragmen::Trait>::Currency::issue(20);
+			let imbalance = <Runtime as pallet_elections_phragmen::Config>::Currency::issue(20);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				122
 			);
 			drop(imbalance);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				102
 			);
 
 			// transfer
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::free_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
 				95
 			);
 			assert_ok!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::ensure_can_withdraw(
+				<Runtime as pallet_elections_phragmen::Config>::Currency::ensure_can_withdraw(
 					&TREASURY_ACCOUNT,
 					10,
 					WithdrawReasons::TRANSFER,
 					0
 				)
 			);
-			assert_ok!(<Runtime as pallet_elections_phragmen::Trait>::Currency::transfer(
+			assert_ok!(<Runtime as pallet_elections_phragmen::Config>::Currency::transfer(
 				&TREASURY_ACCOUNT,
 				&ALICE,
 				11,
 				ExistenceRequirement::KeepAlive
 			));
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::free_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
 				84
 			);
 
 			// deposit
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				102
 			);
 			let imbalance = TreasuryCurrencyAdapter::deposit_creating(&TREASURY_ACCOUNT, 11);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::free_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
 				95
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				102
 			);
 			drop(imbalance);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::free_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
 				95
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				113
 			);
 
 			// withdraw
-			let imbalance = <Runtime as pallet_elections_phragmen::Trait>::Currency::withdraw(
+			let imbalance = <Runtime as pallet_elections_phragmen::Config>::Currency::withdraw(
 				&TREASURY_ACCOUNT,
 				10,
 				WithdrawReasons::TRANSFER,
 				ExistenceRequirement::KeepAlive,
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::free_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
 				85
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				113
 			);
 			drop(imbalance);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::free_balance(&TREASURY_ACCOUNT),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
 				85
 			);
 			assert_eq!(
-				<Runtime as pallet_elections_phragmen::Trait>::Currency::total_issuance(),
+				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
 				103
 			);
 		});
diff --git a/utilities/src/lib.rs b/utilities/src/lib.rs
index 91a71e64b..2304d9e5d 100644
--- a/utilities/src/lib.rs
+++ b/utilities/src/lib.rs
@@ -37,14 +37,14 @@ mod tests {
 	use sp_io::TestExternalities;
 	use sp_runtime::{DispatchError, DispatchResult};
 
-	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 {}
 	}
 
 	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;
 		}
diff --git a/vesting/src/lib.rs b/vesting/src/lib.rs
index 72bf9cd50..90f03d537 100644
--- a/vesting/src/lib.rs
+++ b/vesting/src/lib.rs
@@ -106,18 +106,18 @@ impl<BlockNumber: AtLeast32Bit + Copy, Balance: AtLeast32Bit + Copy> VestingSche
 	}
 }
 
-pub type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
-pub type VestingScheduleOf<T> = VestingSchedule<<T as frame_system::Trait>::BlockNumber, BalanceOf<T>>;
+pub type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+pub type VestingScheduleOf<T> = VestingSchedule<<T as frame_system::Config>::BlockNumber, BalanceOf<T>>;
 pub type ScheduledItem<T> = (
-	<T as frame_system::Trait>::AccountId,
-	<T as frame_system::Trait>::BlockNumber,
-	<T as frame_system::Trait>::BlockNumber,
+	<T as frame_system::Config>::AccountId,
+	<T as frame_system::Config>::BlockNumber,
+	<T as frame_system::Config>::BlockNumber,
 	u32,
 	BalanceOf<T>,
 );
 
-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>;
 	type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
 
 	/// The minimum amount transferred to call `vested_transfer`.
@@ -131,7 +131,7 @@ pub trait Trait: frame_system::Trait {
 }
 
 decl_storage! {
-	trait Store for Module<T: Trait> as Vesting {
+	trait Store for Module<T: Config> as Vesting {
 		/// Vesting schedules of an account.
 		pub VestingSchedules get(fn vesting_schedules) build(|config: &GenesisConfig<T>| {
 			config.vesting.iter()
@@ -152,7 +152,7 @@ decl_storage! {
 
 decl_event!(
 	pub enum Event<T> where
-		<T as frame_system::Trait>::AccountId,
+		<T as frame_system::Config>::AccountId,
 		Balance = BalanceOf<T>,
 		VestingSchedule = VestingScheduleOf<T>
 	{
@@ -167,7 +167,7 @@ decl_event!(
 
 decl_error! {
 	/// Error for vesting module.
-	pub enum Error for Module<T: Trait> {
+	pub enum Error for Module<T: Config> {
 		/// Vesting period is zero
 		ZeroVestingPeriod,
 		/// Number of vests is zero
@@ -184,7 +184,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 amount to be transferred to create a new vesting schedule.
@@ -259,7 +259,7 @@ decl_module! {
 
 const VESTING_LOCK_ID: LockIdentifier = *b"ormlvest";
 
-impl<T: Trait> Module<T> {
+impl<T: Config> Module<T> {
 	fn do_claim(who: &T::AccountId) -> BalanceOf<T> {
 		let locked = Self::locked_balance(who);
 		if locked.is_zero() {
diff --git a/vesting/src/mock.rs b/vesting/src/mock.rs
index 55f2ef219..852cc7d87 100644
--- a/vesting/src/mock.rs
+++ b/vesting/src/mock.rs
@@ -36,7 +36,7 @@ parameter_types! {
 }
 
 pub type AccountId = u128;
-impl frame_system::Trait for Runtime {
+impl frame_system::Config for Runtime {
 	type Origin = Origin;
 	type Call = ();
 	type Index = u64;
@@ -72,7 +72,7 @@ parameter_types! {
 	pub const MinVestedTransfer: u64 = 5;
 }
 
-impl pallet_balances::Trait for Runtime {
+impl pallet_balances::Config for Runtime {
 	type Balance = Balance;
 	type DustRemoval = ();
 	type Event = TestEvent;
@@ -101,7 +101,7 @@ impl EnsureOrigin<Origin> for EnsureAliceOrBob {
 	}
 }
 
-impl Trait for Runtime {
+impl Config for Runtime {
 	type Event = TestEvent;
 	type Currency = PalletBalances;
 	type MinVestedTransfer = MinVestedTransfer;