diff --git a/substrate/bin/node-template/README.md b/substrate/bin/node-template/README.md index c411dbeef5..4ae60478fc 100644 --- a/substrate/bin/node-template/README.md +++ b/substrate/bin/node-template/README.md @@ -1,6 +1,6 @@ # Substrate Node Template -A new SRML-based Substrate node, ready for hacking. +A new FRAME-based Substrate node, ready for hacking. ## Build diff --git a/substrate/bin/node-template/pallets/template/src/lib.rs b/substrate/bin/node-template/pallets/template/src/lib.rs index aa4d2cbc99..34e055bf54 100644 --- a/substrate/bin/node-template/pallets/template/src/lib.rs +++ b/substrate/bin/node-template/pallets/template/src/lib.rs @@ -1,12 +1,12 @@ #![cfg_attr(not(feature = "std"), no_std)] -/// A runtime module template with necessary imports +/// A FRAME pallet template with necessary imports /// Feel free to remove or edit this file as needed. /// If you change the name of this file, make sure to update its references in runtime/src/lib.rs /// If you remove this file, you can remove those references -/// For more guidance on Substrate modules, see the example module +/// For more guidance on Substrate FRAME, see the example pallet /// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs use frame_support::{decl_module, decl_storage, decl_event, decl_error, dispatch}; diff --git a/substrate/bin/node-template/pallets/template/src/mock.rs b/substrate/bin/node-template/pallets/template/src/mock.rs index b3c1098db6..7a23610e4b 100644 --- a/substrate/bin/node-template/pallets/template/src/mock.rs +++ b/substrate/bin/node-template/pallets/template/src/mock.rs @@ -11,9 +11,9 @@ impl_outer_origin! { pub enum Origin for Test {} } -// For testing the module, we construct most of a mock runtime. This means +// For testing the pallet, we construct most of a mock runtime. This means // first constructing a configuration type (`Test`) which `impl`s each of the -// configuration traits of modules we want to use. +// configuration traits of pallets we want to use. #[derive(Clone, Eq, PartialEq)] pub struct Test; parameter_types! { diff --git a/substrate/bin/node/rpc/src/lib.rs b/substrate/bin/node/rpc/src/lib.rs index 16e5446bb1..4e1cfa5673 100644 --- a/substrate/bin/node/rpc/src/lib.rs +++ b/substrate/bin/node/rpc/src/lib.rs @@ -23,9 +23,9 @@ //! need some strong assumptions about the particular runtime. //! //! The RPCs available in this crate however can make some assumptions -//! about how the runtime is constructed and what `SRML` modules +//! about how the runtime is constructed and what FRAME pallets //! are part of it. Therefore all node-runtime-specific RPCs can -//! be placed here or imported from corresponding `SRML` RPC definitions. +//! be placed here or imported from corresponding FRAME RPC definitions. #![warn(missing_docs)] diff --git a/substrate/bin/node/runtime/src/constants.rs b/substrate/bin/node/runtime/src/constants.rs index b2c880c08b..bf12492f8d 100644 --- a/substrate/bin/node/runtime/src/constants.rs +++ b/substrate/bin/node/runtime/src/constants.rs @@ -38,7 +38,7 @@ pub mod time { /// a slot being empty). /// This value is only used indirectly to define the unit constants below /// that are expressed in blocks. The rest of the code should use - /// `SLOT_DURATION` instead (like the timestamp module for calculating the + /// `SLOT_DURATION` instead (like the Timestamp pallet for calculating the /// minimum period). /// /// If using BABE with secondary slots (default) then all of the slots will diff --git a/substrate/docs/CONTRIBUTING.adoc b/substrate/docs/CONTRIBUTING.adoc index c83b686b09..cdd9809fff 100644 --- a/substrate/docs/CONTRIBUTING.adoc +++ b/substrate/docs/CONTRIBUTING.adoc @@ -27,7 +27,7 @@ Merging pull requests once CI is successful: . Once a PR is ready for review please add the https://github.com/paritytech/substrate/pulls?q=is%3Apr+is%3Aopen+label%3AA0-pleasereview[`pleasereview`] label. Generally PRs should sit with this label for 48 hours in order to garner feedback. It may be merged before if all relevant parties had a look at it. . If the first review is not an approval, swap `A0-pleasereview` to any label `[A3, A7]` to indicate that the PR has received some feedback, but needs further work. For example. https://github.com/paritytech/substrate/labels/A3-inprogress[`A3-inprogress`] is a general indicator that the PR is work in progress and https://github.com/paritytech/substrate/labels/A4-gotissues[`A4-gotissues`] means that it has significant problems that need fixing. Once the work is done, change the label back to `A0-pleasereview`. You might end up swapping a few times back and forth to climb up the A label group. Once a PR is https://github.com/paritytech/substrate/labels/A8-looksgood[`A8-looksgood`], it is ready to merge. -. PRs that break the external API must be tagged with https://github.com/paritytech/substrate/labels/B2-breaksapi[`breaksapi`], when it changes the SRML or consensus of running system with https://github.com/paritytech/substrate/labels/B3-breaksconsensus[`breaksconsensus`] +. PRs that break the external API must be tagged with https://github.com/paritytech/substrate/labels/B2-breaksapi[`breaksapi`], when it changes the FRAME or consensus of running system with https://github.com/paritytech/substrate/labels/B3-breaksconsensus[`breaksconsensus`] . No PR should be merged until all reviews' comments are addressed. *Reviewing pull requests*: diff --git a/substrate/docs/README.adoc b/substrate/docs/README.adoc index bbc2713fbe..8d762fee05 100644 --- a/substrate/docs/README.adoc +++ b/substrate/docs/README.adoc @@ -26,7 +26,7 @@ Substrate is designed for use in one of three ways: **2. Modular**: By hacking together pallets built with Substrate FRAME into a new runtime and possibly altering or reconfiguring the Substrate client's block authoring logic. This affords you a very large amount of freedom over your blockchain's logic, letting you change data types, add or remove modules, and crucially, add your own modules. Much can be changed without touching the block authoring logic (since it is generic). If this is the case, then the existing Substrate binary can be used for block authoring and syncing. If the block authoring logic needs to be tweaked, then a new, altered block authoring binary must be built as a separate project and used by validators. This is how the Polkadot relay chain is built and should suffice for almost all circumstances in the near to mid-term. -**3. Generic**: The entire SRML can be ignored and the entire runtime designed and implemented from scratch. If desired, this can be done in a language other than Rust, provided it can target WebAssembly. If the runtime can be made compatible with the existing client's block authoring logic, then you can simply construct a new genesis block from your Wasm blob and launch your chain with the existing Rust-based Substrate client. If not, then you'll need to alter the client's block authoring logic accordingly. This is probably a useless option for most projects right now, but provides complete flexibility allowing for a long-term, far-reaching upgrade path for the Substrate paradigm. +**3. Generic**: The entire FRAME can be ignored and the entire runtime designed and implemented from scratch. If desired, this can be done in a language other than Rust, provided it can target WebAssembly. If the runtime can be made compatible with the existing client's block authoring logic, then you can simply construct a new genesis block from your Wasm blob and launch your chain with the existing Rust-based Substrate client. If not, then you'll need to alter the client's block authoring logic accordingly. This is probably a useless option for most projects right now, but provides complete flexibility allowing for a long-term, far-reaching upgrade path for the Substrate paradigm. === The Basics of Substrate diff --git a/substrate/frame/assets/src/lib.rs b/substrate/frame/assets/src/lib.rs index 8cdc9b9cc0..ebd1d17bcf 100644 --- a/substrate/frame/assets/src/lib.rs +++ b/substrate/frame/assets/src/lib.rs @@ -265,9 +265,9 @@ mod tests { pub enum Origin for Test where system = frame_system {} } - // For testing the module, we construct most of a mock runtime. This means + // For testing the pallet, we construct most of a mock runtime. This means // first constructing a configuration type (`Test`) which `impl`s each of the - // configuration traits of modules we want to use. + // configuration traits of pallets we want to use. #[derive(Clone, Eq, PartialEq)] pub struct Test; parameter_types! { diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml index 124d66c1bc..61056820f4 100644 --- a/substrate/frame/authorship/Cargo.toml +++ b/substrate/frame/authorship/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-authorship" version = "2.0.0" -description = "Block and Uncle Author tracking for the SRML" +description = "Block and Uncle Author tracking for the FRAME" authors = ["Parity Technologies "] edition = "2018" license = "GPL-3.0" diff --git a/substrate/frame/authorship/src/lib.rs b/substrate/frame/authorship/src/lib.rs index f2dbd4674f..335e13a7fd 100644 --- a/substrate/frame/authorship/src/lib.rs +++ b/substrate/frame/authorship/src/lib.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -//! Authorship tracking for SRML runtimes. +//! Authorship tracking for FRAME runtimes. //! //! This tracks the current author of the block and recent uncles. diff --git a/substrate/frame/babe/src/lib.rs b/substrate/frame/babe/src/lib.rs index e4e37a4b7a..aba3a75eb9 100644 --- a/substrate/frame/babe/src/lib.rs +++ b/substrate/frame/babe/src/lib.rs @@ -159,7 +159,7 @@ decl_storage! { } decl_module! { - /// The BABE SRML module + /// The BABE Pallet pub struct Module 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. diff --git a/substrate/frame/balances/src/lib.rs b/substrate/frame/balances/src/lib.rs index 2c8ae3e18f..0f5e8b40d5 100644 --- a/substrate/frame/balances/src/lib.rs +++ b/substrate/frame/balances/src/lib.rs @@ -92,7 +92,7 @@ //! //! The following examples show how to use the Balances module in your custom module. //! -//! ### Examples from the SRML +//! ### Examples from the FRAME //! //! The Contract module uses the `Currency` trait to handle gas payment, and its types inherit from `Currency`: //! @@ -896,7 +896,7 @@ mod imbalances { // This works as long as `increase_total_issuance_by` doesn't use the Imbalance // types (basically for charging fees). // This should eventually be refactored so that the type item that -// depends on the Imbalance type (DustRemoval) is placed in its own SRML module. +// depends on the Imbalance type (DustRemoval) is placed in its own pallet. struct ElevatedTrait, I: Instance>(T, I); impl, I: Instance> Clone for ElevatedTrait { fn clone(&self) -> Self { unimplemented!() } diff --git a/substrate/frame/example/src/lib.rs b/substrate/frame/example/src/lib.rs index dbdc2efcf8..39f0d25d32 100644 --- a/substrate/frame/example/src/lib.rs +++ b/substrate/frame/example/src/lib.rs @@ -14,22 +14,22 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -//! # Example Module +//! # Example Pallet //! //! -//! The Example: A simple example of a runtime module demonstrating -//! concepts, APIs and structures common to most runtime modules. +//! The Example: A simple example of a FRAME pallet demonstrating +//! concepts, APIs and structures common to most FRAME runtimes. //! -//! Run `cargo doc --package pallet-example --open` to view this module's documentation. +//! Run `cargo doc --package pallet-example --open` to view this pallet's documentation. //! //! ### Documentation Guidelines: //! //! -//! +//! //!
    //!
  • Documentation comments (i.e. /// comment) - should -//! accompany module functions and be restricted to the module interface, -//! not the internals of the module implementation. Only state inputs, +//! accompany pallet functions and be restricted to the pallet interface, +//! not the internals of the pallet implementation. Only state inputs, //! outputs, and a brief description that mentions whether calling it //! requires root, but without repeating the source code details. //! Capitalize the first word of each documentation comment and end it with @@ -50,29 +50,29 @@ //! ### Documentation Template:
    //! //! Copy and paste this template from frame/example/src/lib.rs into file -//! `frame//src/lib.rs` of your own custom module and complete it. +//! `frame//src/lib.rs` of your own custom pallet and complete it. //! 

    -//! // Add heading with custom module name
+//! // Add heading with custom pallet name
 //!
-//! \#  Module
+//! \#  Pallet
 //!
 //! // Add simple description
 //!
-//! // Include the following links that shows what trait needs to be implemented to use the module
+//! // 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.
 //!
-//! - \[`::Trait`](./trait.Trait.html)
+//! - \[`::Trait`](./trait.Trait.html)
 //! - \[`Call`](./enum.Call.html)
 //! - \[`Module`](./struct.Module.html)
 //!
 //! \## Overview
 //!
 //! 
-//! // Short description of module purpose.
+//! // Short description of pallet's purpose.
 //! // Links to Traits that should be implemented.
-//! // What this module is for.
-//! // What functionality the module provides.
-//! // When to use the module (use case examples).
+//! // What this pallet is for.
+//! // What functionality the pallet provides.
+//! // When to use the pallet (use case examples).
 //! // How it is used.
 //! // Inputs it uses and the source of each input.
 //! // Outputs it produces.
@@ -82,18 +82,18 @@
 //!
 //! \## Terminology
 //!
-//! // Add terminology used in the custom module. Include concepts, storage items, or actions that you think
-//! // deserve to be noted to give context to the rest of the documentation or module usage. The author needs to
+//! // Add terminology used in the custom pallet. Include concepts, storage items, or actions that you think
+//! // deserve to be noted to give context to the rest of the documentation or pallet usage. The author needs to
 //! // use some judgment about what is included. We don't want a list of every storage item nor types - the user
 //! // can go to the code for that. For example, "transfer fee" is obvious and should not be included, but
-//! // "free balance" and "reserved balance" should be noted to give context to the module.
+//! // "free balance" and "reserved balance" should be noted to give context to the pallet.
 //! // Please do not link to outside resources. The reference docs should be the ultimate source of truth.
 //!
 //! 
 //!
 //! \## Goals
 //!
-//! // Add goals that the custom module is designed to achieve.
+//! // Add goals that the custom pallet is designed to achieve.
 //!
 //! 
 //!
@@ -103,14 +103,14 @@
 //!
 //! \#### 
 //!
-//! // Describe requirements prior to interacting with the custom module.
-//! // Describe the process of interacting with the custom module for this scenario and public API functions used.
+//! // Describe requirements prior to interacting with the custom pallet.
+//! // Describe the process of interacting with the custom pallet for this scenario and public API functions used.
 //!
 //! \## Interface
 //!
 //! \### Supported Origins
 //!
-//! // What origins are used and supported in this module (root, signed, none)
+//! // What origins are used and supported in this pallet (root, signed, none)
 //! // i.e. root when \`ensure_root\` used
 //! // i.e. none when \`ensure_none\` used
 //! // i.e. signed when \`ensure_signed\` used
@@ -145,14 +145,14 @@
 //!
 //! 
 //!
-//! // A link to the rustdoc and any notes about usage in the module, not for specific functions.
-//! // For example, in the balances module: "Note that when using the publicly exposed functions,
+//! // A link to the rustdoc and any notes about usage in the pallet, not for specific functions.
+//! // For example, in the Balances Pallet: "Note that when using the publicly exposed functions,
 //! // you (the runtime developer) are responsible for implementing any necessary checks
 //! // (e.g. that the sender is the signer) before calling a function that will affect storage."
 //!
 //! 
 //!
-//! // It is up to the writer of the respective module (with respect to how much information to provide).
+//! // It is up to the writer of the respective pallet (with respect to how much information to provide).
 //!
 //! \#### Public Inspection functions - Immutable (getters)
 //!
@@ -179,19 +179,19 @@
 //!
 //! \### Storage Items
 //!
-//! // Explain any storage items included in this module
+//! // Explain any storage items included in this pallet
 //!
 //! \### Digest Items
 //!
-//! // Explain any digest items included in this module
+//! // Explain any digest items included in this pallet
 //!
 //! \### Inherent Data
 //!
-//! // Explain what inherent data (if any) is defined in the module and any other related types
+//! // Explain what inherent data (if any) is defined in the pallet and any other related types
 //!
 //! \### Events:
 //!
-//! // Insert events for this module if any
+//! // Insert events for this pallet if any
 //!
 //! \### Errors:
 //!
@@ -200,24 +200,24 @@
 //! \## Usage
 //!
 //! // Insert 2-3 examples of usage and code snippets that show how to
-//! // use  module in a custom module.
+//! // use  Pallet in a custom pallet.
 //!
 //! \### Prerequisites
 //!
-//! // Show how to include necessary imports for  and derive
-//! // your module configuration trait with the `INSERT_CUSTOM_MODULE_NAME` trait.
+//! // Show how to include necessary imports for  and derive
+//! // your pallet configuration trait with the `INSERT_CUSTOM_PALLET_NAME` trait.
 //!
 //! \```rust
-//! use ;
+//! use ;
 //!
-//! pub trait Trait: ::Trait { }
+//! pub trait Trait: ::Trait { }
 //! \```
 //!
 //! \### Simple Code Snippet
 //!
-//! // Show a simple example (e.g. how to query a public getter function of )
+//! // Show a simple example (e.g. how to query a public getter function of )
 //!
-//! \### Example from SRML
+//! \### Example from FRAME
 //!
 //! // Show a usage example in an actual runtime
 //!
@@ -231,16 +231,16 @@
 //!
 //! \## Dependencies
 //!
-//! // Dependencies on other SRML modules and the genesis config should be mentioned,
+//! // Dependencies on other FRAME pallets and the genesis config should be mentioned,
 //! // but not the Rust Standard Library.
-//! // Genesis configuration modifications that may be made to incorporate this module
-//! // Interaction with other modules
+//! // Genesis configuration modifications that may be made to incorporate this pallet
+//! // Interaction with other pallets
 //!
 //! 
 //!
-//! \## Related Modules
+//! \## Related Pallets
 //!
-//! // Interaction with other modules in the form of a bullet point list
+//! // Interaction with other pallets in the form of a bullet point list
 //!
 //! \## References
 //!
@@ -307,11 +307,11 @@ impl PaysFee<(&BalanceOf,)> for WeightForSetDummy<
 	}
 }
 
-/// A type alias for the balance type from this module's point of view.
+/// A type alias for the balance type from this pallet's point of view.
 type BalanceOf = ::Balance;
 
-/// Our module's configuration trait. All our types and constants go in here. If the
-/// module is dependent on specific other modules, then their configuration traits
+/// 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.
@@ -321,7 +321,7 @@ pub trait Trait: pallet_balances::Trait {
 }
 
 decl_storage! {
-	// A macro for the Storage trait, and its implementation, for this module.
+	// A macro for the Storage trait, and its implementation, for this pallet.
 	// This allows for type-safe usage of the Substrate storage database, so you can
 	// keep things around between blocks.
 	trait Store for Module as Example {
@@ -345,7 +345,7 @@ decl_storage! {
 		// `frame_support::StorageValue`. For map items, you'll get a type which
 		// implements `frame_support::StorageMap`.
 		//
-		// If they have a getter (`get(getter_name)`), then your module will come
+		// If they have a getter (`get(getter_name)`), then your pallet will come
 		// equipped with `fn getter_name() -> Type` for basic value items or
 		// `fn getter_name(key: KeyType) -> ValueType` for map items.
 		Dummy get(fn dummy) config(): Option;
@@ -394,7 +394,7 @@ decl_event!(
 // The `Result` is required as part of the syntax (and expands to the conventional dispatch
 // result of `Result<(), &'static str>`).
 //
-// When you come to `impl` them later in the module, you must specify the full type for `origin`:
+// When you come to `impl` them later in the pallet, you must specify the full type for `origin`:
 //
 // `fn foo(origin: T::Origin, bar: Bar, baz: Baz) { ... }`
 //
@@ -406,13 +406,13 @@ decl_event!(
 decl_module! {
 	// Simple declaration of the `Module` type. Lets the macro know what its working on.
 	pub struct Module for enum Call where origin: T::Origin {
-		/// Deposit one of this module's events by using the default implementation.
+		/// 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
 		/// looks like: `fn deposit_event() = default;`.
 		fn deposit_event() = default;
 		/// This is your public interface. Be extremely careful.
-		/// This is just a simple example of how to interact with the module from the external
+		/// This is just a simple example of how to interact with the pallet from the external
 		/// world.
 		// This just increases the value of `Dummy` by `increase_by`.
 		//
@@ -434,7 +434,7 @@ decl_module! {
 		// If you can't be certain that the operation will succeed without substantial computation
 		// then you have a classic blockchain attack scenario. The normal way of managing this is
 		// to attach a bond to the operation. As the first major alteration of storage, reserve
-		// some value from the sender's account (`Balances` module has a `reserve` function for
+		// some value from the sender's account (`Balances` Pallet has a `reserve` function for
 		// exactly this scenario). This amount should be enough to cover any costs of the
 		// substantial execution in case it turns out that you can't proceed with the operation.
 		//
@@ -450,7 +450,7 @@ decl_module! {
 		// If you don't respect these rules, it is likely that your chain will be attackable.
 		//
 		// Each transaction can define an optional `#[weight]` attribute to convey a set of static
-		// information about its dispatch. The `system` and `executive` module then use this
+		// information about its dispatch. FRAME System and FRAME Executive pallet then use this
 		// information to properly execute the transaction, whilst keeping the total load of the
 		// chain in a moderate rate.
 		//
@@ -535,11 +535,11 @@ decl_module! {
 	}
 }
 
-// The main implementation block for the module. Functions here fall into three broad
+// The main implementation block for the pallet. Functions here fall into three broad
 // categories:
 // - 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 modules.
+// - Private functions. These are your usual private utilities unavailable to other pallets.
 impl Module {
 	// Add public immutables and private mutables.
 	#[allow(dead_code)]
@@ -558,10 +558,10 @@ impl Module {
 	}
 }
 
-// Similar to other SRML modules, your module can also define a signed extension and perform some
+// Similar to other FRAME pallets, your pallet can also define a signed extension and perform some
 // checks and [pre/post]processing [before/after] the transaction. A signed extension can be any
 // 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 module:
+// 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.
 //   - Otherwise, create a tuple struct which contains the external data. Of course, for the entire
@@ -569,12 +569,12 @@ impl Module {
 //
 // Note that a signed extension can also indicate that a particular data must be present in the
 // _signing payload_ of a transaction by providing an implementation for the `additional_signed`
-// method. This example will not cover this type of extension. See `CheckRuntime` in system module
+// method. This example will not cover this type of extension. See `CheckRuntime` in FRAME System
 // for an example.
 //
 // Using the extension, you can add some hooks to the life cycle of each transaction. Note that by
 // default, an extension is applied to all `Call` functions (i.e. all transactions). the `Call` enum
-// variant is given to each function of `SignedExtension`. Hence, you can filter based on module or
+// variant is given to each function of `SignedExtension`. Hence, you can filter based on pallet or
 // a particular call if needed.
 //
 // Some extra information, such as encoded length, some static dispatch info like weight and the
@@ -606,9 +606,9 @@ impl SignedExtension for WatchDummy {
 	const IDENTIFIER: &'static str = "WatchDummy";
 	type AccountId = T::AccountId;
 	// Note that this could also be assigned to the top-level call enum. It is passed into the
-	// balances module directly and since `Trait: pallet_balances::Trait`, you could also use `T::Call`.
+	// Balances Pallet directly and since `Trait: pallet_balances::Trait`, you could also use `T::Call`.
 	// In that case, you would have had access to all call variants and could match on variants from
-	// other modules.
+	// other pallets.
 	type Call = Call;
 	type AdditionalSigned = ();
 	type DispatchInfo = DispatchInfo;
@@ -660,9 +660,9 @@ mod tests {
 		pub enum Origin for Test  where system = frame_system {}
 	}
 
-	// For testing the module, we construct most of a mock runtime. This means
+	// For testing the pallet, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of modules we want to use.
+	// configuration traits of pallets we want to use.
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
 	parameter_types! {
diff --git a/substrate/frame/executive/src/lib.rs b/substrate/frame/executive/src/lib.rs
index c112298051..792643919d 100644
--- a/substrate/frame/executive/src/lib.rs
+++ b/substrate/frame/executive/src/lib.rs
@@ -21,9 +21,9 @@
 //!
 //! ## Overview
 //!
-//! The executive module is not a typical SRML module providing functionality around a specific feature.
-//! It is a cross-cutting framework component for the SRML. It works in conjunction with the
-//! [SRML System module](../frame_system/index.html) to perform these cross-cutting functions.
+//! The executive module is not a typical pallet providing functionality around a specific feature.
+//! It is a cross-cutting framework component for the FRAME. It works in conjunction with the
+//! [FRAME System module](../frame_system/index.html) to perform these cross-cutting functions.
 //!
 //! The Executive module provides functions to:
 //!
@@ -39,7 +39,7 @@
 //! The Executive module provides the following implementations:
 //!
 //! - `ExecuteBlock`: Trait that can be used to execute a block.
-//! - `Executive`: Type that can be used to make the SRML available from the runtime.
+//! - `Executive`: Type that can be used to make the FRAME available from the runtime.
 //!
 //! ## Usage
 //!
diff --git a/substrate/frame/finality-tracker/src/lib.rs b/substrate/frame/finality-tracker/src/lib.rs
index f7bb7b8566..ef6e0d9a4b 100644
--- a/substrate/frame/finality-tracker/src/lib.rs
+++ b/substrate/frame/finality-tracker/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! SRML module that tracks the last finalized block, as perceived by block authors.
+//! FRAME Pallet that tracks the last finalized block, as perceived by block authors.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/substrate/frame/generic-asset/src/lib.rs b/substrate/frame/generic-asset/src/lib.rs
index 233054dd9d..e98fc32ecb 100644
--- a/substrate/frame/generic-asset/src/lib.rs
+++ b/substrate/frame/generic-asset/src/lib.rs
@@ -108,11 +108,11 @@
 //!
 //! ### Usage
 //!
-//! The following examples show how to use the Generic Asset module in your custom module.
+//! The following examples show how to use the Generic Asset Pallet in your custom pallet.
 //!
-//! ### Examples from the frame module
+//! ### Examples from the FRAME pallet
 //!
-//! The Fees module uses the `Currency` trait to handle fee charge/refund, and its types inherit from `Currency`:
+//! The Fees Pallet uses the `Currency` trait to handle fee charge/refund, and its types inherit from `Currency`:
 //!
 //! ```
 //! use frame_support::{
@@ -148,7 +148,7 @@
 //!
 //! ## Genesis config
 //!
-//! The Generic Asset module depends on the [`GenesisConfig`](./struct.GenesisConfig.html).
+//! The Generic Asset Pallet depends on the [`GenesisConfig`](./struct.GenesisConfig.html).
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -1092,7 +1092,7 @@ mod imbalances {
 // types (basically for charging fees).
 // This should eventually be refactored so that the two type items that do
 // depend on the Imbalance type (TransactionPayment, DustRemoval)
-// are placed in their own SRML module.
+// are placed in their own pallet.
 struct ElevatedTrait(T);
 impl Clone for ElevatedTrait {
 	fn clone(&self) -> Self {
diff --git a/substrate/frame/generic-asset/src/mock.rs b/substrate/frame/generic-asset/src/mock.rs
index 141f7d0030..7a61a61c43 100644
--- a/substrate/frame/generic-asset/src/mock.rs
+++ b/substrate/frame/generic-asset/src/mock.rs
@@ -34,9 +34,9 @@ impl_outer_origin! {
 	pub enum Origin for Test where system = frame_system {}
 }
 
-// For testing the module, we construct most of a mock runtime. This means
+// For testing the pallet, we construct most of a mock runtime. This means
 // first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of modules we want to use.
+// configuration traits of pallets we want to use.
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 parameter_types! {
diff --git a/substrate/frame/identity/src/lib.rs b/substrate/frame/identity/src/lib.rs
index 341356394d..895efa1c81 100644
--- a/substrate/frame/identity/src/lib.rs
+++ b/substrate/frame/identity/src/lib.rs
@@ -896,9 +896,9 @@ mod tests {
 		pub enum Origin for Test  where system = frame_system {}
 	}
 
-	// For testing the module, we construct most of a mock runtime. This means
+	// For testing the pallet, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of modules we want to use.
+	// configuration traits of pallets we want to use.
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
 	parameter_types! {
diff --git a/substrate/frame/membership/src/lib.rs b/substrate/frame/membership/src/lib.rs
index c275bb783b..1ad187b2ee 100644
--- a/substrate/frame/membership/src/lib.rs
+++ b/substrate/frame/membership/src/lib.rs
@@ -241,9 +241,9 @@ mod tests {
 		pub enum Origin for Test  where system = frame_system {}
 	}
 
-	// For testing the module, we construct most of a mock runtime. This means
+	// For testing the pallet, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of modules we want to use.
+	// configuration traits of pallets we want to use.
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
 	parameter_types! {
diff --git a/substrate/frame/nicks/src/lib.rs b/substrate/frame/nicks/src/lib.rs
index 16797ffdef..2b2d59014d 100644
--- a/substrate/frame/nicks/src/lib.rs
+++ b/substrate/frame/nicks/src/lib.rs
@@ -257,9 +257,9 @@ mod tests {
 		pub enum Origin for Test  where system = frame_system {}
 	}
 
-	// For testing the module, we construct most of a mock runtime. This means
+	// For testing the pallet, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of modules we want to use.
+	// configuration traits of pallets we want to use.
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
 	parameter_types! {
diff --git a/substrate/frame/recovery/src/mock.rs b/substrate/frame/recovery/src/mock.rs
index e6bc84f76b..97ee07bc6a 100644
--- a/substrate/frame/recovery/src/mock.rs
+++ b/substrate/frame/recovery/src/mock.rs
@@ -48,9 +48,9 @@ impl_outer_dispatch! {
 	}
 }
 
-// For testing the module, we construct most of a mock runtime. This means
+// For testing the pallet, we construct most of a mock runtime. This means
 // first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of modules we want to use.
+// configuration traits of pallets we want to use.
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 
diff --git a/substrate/frame/scored-pool/src/mock.rs b/substrate/frame/scored-pool/src/mock.rs
index cccb3c2b4c..90006da91e 100644
--- a/substrate/frame/scored-pool/src/mock.rs
+++ b/substrate/frame/scored-pool/src/mock.rs
@@ -32,9 +32,9 @@ impl_outer_origin! {
 	pub enum Origin for Test  where system = frame_system {}
 }
 
-// For testing the module, we construct most of a mock runtime. This means
+// For testing the pallet, we construct most of a mock runtime. This means
 // first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of modules we want to use.
+// configuration traits of pallets we want to use.
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 parameter_types! {
diff --git a/substrate/frame/session/src/historical.rs b/substrate/frame/session/src/historical.rs
index 76175cd6be..cf20f31360 100644
--- a/substrate/frame/session/src/historical.rs
+++ b/substrate/frame/session/src/historical.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! An opt-in utility for tracking historical sessions in SRML-session.
+//! An opt-in utility for tracking historical sessions in FRAME-session.
 //!
 //! This is generally useful when implementing blockchains that require accountable
 //! safety where validators from some amount f prior sessions must remain slashable.
diff --git a/substrate/frame/session/src/lib.rs b/substrate/frame/session/src/lib.rs
index 5226415400..0abe06527b 100644
--- a/substrate/frame/session/src/lib.rs
+++ b/substrate/frame/session/src/lib.rs
@@ -80,7 +80,7 @@
 //!
 //! ## Usage
 //!
-//! ### Example from the SRML
+//! ### Example from the FRAME
 //!
 //! The [Staking pallet](../pallet_staking/index.html) uses the Session pallet to get the validator set.
 //!
diff --git a/substrate/frame/society/src/mock.rs b/substrate/frame/society/src/mock.rs
index 84b2343fae..62be1aa9f1 100644
--- a/substrate/frame/society/src/mock.rs
+++ b/substrate/frame/society/src/mock.rs
@@ -33,9 +33,9 @@ impl_outer_origin! {
 	pub enum Origin for Test {}
 }
 
-// For testing the module, we construct most of a mock runtime. This means
+// For testing the pallet, we construct most of a mock runtime. This means
 // first constructing a configuration type (`Test`) which `impl`s each of the
-// configuration traits of modules we want to use.
+// configuration traits of pallets we want to use.
 #[derive(Clone, Eq, PartialEq)]
 pub struct Test;
 parameter_types! {
diff --git a/substrate/frame/support/procedural/src/lib.rs b/substrate/frame/support/procedural/src/lib.rs
index 8849e52c79..abe78d4f5b 100644
--- a/substrate/frame/support/procedural/src/lib.rs
+++ b/substrate/frame/support/procedural/src/lib.rs
@@ -99,7 +99,7 @@ use proc_macro::TokenStream;
 ///   with care, see generator documentation.
 ///
 ///   All key formatting logic can be accessed in a type-agnostic format via the
-///   [`KeyFormat`](../srml_support/storage/generator/trait.KeyFormat.html) trait, which
+///   `KeyFormat` trait, which
 ///   is implemented for the storage linked map type as well.
 ///
 ///   The generator key format is implemented with:
diff --git a/substrate/frame/support/src/dispatch.rs b/substrate/frame/support/src/dispatch.rs
index 2a3e638de3..084ea285af 100644
--- a/substrate/frame/support/src/dispatch.rs
+++ b/substrate/frame/support/src/dispatch.rs
@@ -62,14 +62,14 @@ impl Parameter for T where T: Codec + EncodeLike + Clone + Eq + fmt::Debug {}
 /// 	pub struct Module for enum Call where origin: T::Origin {
 ///
 /// 		// Private functions are dispatchable, but not available to other
-/// 		// SRML modules.
+/// 		// FRAME pallets.
 /// 		fn my_function(origin, var: u64) -> dispatch::DispatchResult {
 ///				// Your implementation
 ///				Ok(())
 /// 		}
 ///
 ///			// Public functions are both dispatchable and available to other
-/// 		// SRML modules.
+/// 		// FRAME pallets.
 ///			pub fn my_public_function(origin) -> dispatch::DispatchResult {
 /// 			// Your implementation
 ///				Ok(())
@@ -82,9 +82,9 @@ impl 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`.
-/// * `Call`: The enum generated for every module, which implements [`Callable`](./dispatch/trait.Callable.html).
+/// * `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 module functions.
+/// * `Result`: The expected return type from pallet functions.
 ///
 /// The first parameter of dispatchable functions must always be `origin`.
 ///
diff --git a/substrate/frame/support/src/traits.rs b/substrate/frame/support/src/traits.rs
index e12defcc54..570342bf57 100644
--- a/substrate/frame/support/src/traits.rs
+++ b/substrate/frame/support/src/traits.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Traits for SRML.
+//! Traits for FRAME.
 //!
 //! NOTE: If you're looking for `parameter_types`, it has moved in to the top-level module.
 
diff --git a/substrate/frame/system/src/lib.rs b/substrate/frame/system/src/lib.rs
index 57be7b157c..875a1d7cfe 100644
--- a/substrate/frame/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -17,14 +17,14 @@
 //! # System Module
 //!
 //! The System module provides low-level access to core types and cross-cutting utilities.
-//! It acts as the base layer for other SRML modules to interact with the Substrate framework components.
+//! It acts as the base layer for other pallets to interact with the Substrate framework components.
 //!
 //! - [`system::Trait`](./trait.Trait.html)
 //!
 //! ## Overview
 //!
 //! The System module defines the core data types used in a Substrate runtime.
-//! It also provides several utility functions (see [`Module`](./struct.Module.html)) for other runtime modules.
+//! It also provides several utility functions (see [`Module`](./struct.Module.html)) for other FRAME pallets.
 //!
 //! In addition, it manages the storage items for extrinsics data, indexes, event records, and digest items,
 //! among other things that support the execution of the current block.
@@ -44,7 +44,7 @@
 //!
 //! ### Signed Extensions
 //!
-//! The system module defines the following extensions:
+//! The System module defines the following extensions:
 //!
 //!   - [`CheckWeight`]: Checks the weight and length of the block and ensure that it does not
 //!     exceed the limits.
diff --git a/substrate/frame/timestamp/src/lib.rs b/substrate/frame/timestamp/src/lib.rs
index 95e1fc3a5e..de36b65851 100644
--- a/substrate/frame/timestamp/src/lib.rs
+++ b/substrate/frame/timestamp/src/lib.rs
@@ -79,7 +79,7 @@
 //! # fn main() {}
 //! ```
 //!
-//! ### Example from the SRML
+//! ### Example from the FRAME
 //!
 //! The [Session module](https://github.com/paritytech/substrate/blob/master/frame/session/src/lib.rs) uses
 //! the Timestamp module for session management.
diff --git a/substrate/frame/utility/src/lib.rs b/substrate/frame/utility/src/lib.rs
index 501e04ad55..da099fcb4a 100644
--- a/substrate/frame/utility/src/lib.rs
+++ b/substrate/frame/utility/src/lib.rs
@@ -594,9 +594,9 @@ mod tests {
 		}
 	}
 
-	// For testing the module, we construct most of a mock runtime. This means
+	// For testing the pallet, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of modules we want to use.
+	// configuration traits of pallets we want to use.
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
 	parameter_types! {
diff --git a/substrate/frame/vesting/src/lib.rs b/substrate/frame/vesting/src/lib.rs
index 3777475f3f..15adcaaf53 100644
--- a/substrate/frame/vesting/src/lib.rs
+++ b/substrate/frame/vesting/src/lib.rs
@@ -309,9 +309,9 @@ mod tests {
 		pub enum Origin for Test  where system = frame_system {}
 	}
 
-	// For testing the module, we construct most of a mock runtime. This means
+	// For testing the pallet, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
-	// configuration traits of modules we want to use.
+	// configuration traits of pallets we want to use.
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
 	parameter_types! {
diff --git a/substrate/primitives/finality-tracker/src/lib.rs b/substrate/primitives/finality-tracker/src/lib.rs
index 0c462c4052..a7157139dc 100644
--- a/substrate/primitives/finality-tracker/src/lib.rs
+++ b/substrate/primitives/finality-tracker/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! SRML module that tracks the last finalized block, as perceived by block authors.
+//! FRAME module that tracks the last finalized block, as perceived by block authors.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/substrate/primitives/phragmen/src/lib.rs b/substrate/primitives/phragmen/src/lib.rs
index e2f77e5458..23acec19da 100644
--- a/substrate/primitives/phragmen/src/lib.rs
+++ b/substrate/primitives/phragmen/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! Rust implementation of the Phragmén election algorithm. This is used in several SRML modules to
+//! Rust implementation of the Phragmén election algorithm. This is used in several pallets to
 //! optimally distribute the weight of a set of voters among an elected set of candidates. In the
 //! context of staking this is mapped to validators and nominators.
 //!
@@ -119,7 +119,7 @@ pub struct PhragmenResult {
 ///
 /// This complements the [`PhragmenResult`] and is needed to run the equalize post-processing.
 ///
-/// This, at the current version, resembles the `Exposure` defined in the staking SRML module, yet
+/// This, at the current version, resembles the `Exposure` defined in the Staking pallet, yet
 /// they do not necessarily have to be the same.
 #[derive(Default, RuntimeDebug)]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, Eq, PartialEq))]
diff --git a/substrate/utils/frame/rpc/system/src/lib.rs b/substrate/utils/frame/rpc/system/src/lib.rs
index 46204082be..e6214c73d6 100644
--- a/substrate/utils/frame/rpc/system/src/lib.rs
+++ b/substrate/utils/frame/rpc/system/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see .
 
-//! System SRML specific RPC methods.
+//! System FRAME specific RPC methods.
 
 use std::sync::Arc;