diff --git a/substrate/srml/assets/Cargo.toml b/substrate/srml/assets/Cargo.toml
index 2badb46130..d5924cfdda 100644
--- a/substrate/srml/assets/Cargo.toml
+++ b/substrate/srml/assets/Cargo.toml
@@ -16,7 +16,7 @@ system = { package = "srml-system", path = "../system", default-features = false
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
-sr-std = { path = "../../core/sr-std" }
+rstd = { package = "sr-std", path = "../../core/sr-std" }
 runtime_io = { package = "sr-io", path = "../../core/sr-io" }
 
 [features]
diff --git a/substrate/srml/membership/Cargo.toml b/substrate/srml/membership/Cargo.toml
index 5126f41f89..7c167bbf2c 100644
--- a/substrate/srml/membership/Cargo.toml
+++ b/substrate/srml/membership/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-sr-std = { path = "../../core/sr-std", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-io = { path = "../../core/sr-io", default-features = false }
 srml-support = { path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
@@ -22,7 +22,7 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"sr-std/std",
+	"rstd/std",
 	"sr-io/std",
 	"srml-support/std",
 	"system/std",
diff --git a/substrate/srml/membership/src/lib.rs b/substrate/srml/membership/src/lib.rs
index 842d4090b1..76729d633d 100644
--- a/substrate/srml/membership/src/lib.rs
+++ b/substrate/srml/membership/src/lib.rs
@@ -22,7 +22,7 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sr_std::prelude::*;
+use rstd::prelude::*;
 use srml_support::{
 	StorageValue, decl_module, decl_storage, decl_event, traits::{ChangeMembers, InitializeMembers},
 };
@@ -61,7 +61,7 @@ decl_storage! {
 	}
 	add_extra_genesis {
 		config(members): Vec<T::AccountId>;
-		config(phantom): sr_std::marker::PhantomData<I>;
+		config(phantom): rstd::marker::PhantomData<I>;
 		build(|config: &Self| {
 			let mut members = config.members.clone();
 			members.sort();
@@ -85,7 +85,7 @@ decl_event!(
 		/// The membership was reset; see the transaction for who the new set is.
 		MembersReset,
 		/// Phantom member, never used.
-		Dummy(sr_std::marker::PhantomData<(AccountId, Event)>),
+		Dummy(rstd::marker::PhantomData<(AccountId, Event)>),
 	}
 );
 
diff --git a/substrate/srml/scored-pool/Cargo.toml b/substrate/srml/scored-pool/Cargo.toml
index 6494d363fa..032f28a750 100644
--- a/substrate/srml/scored-pool/Cargo.toml
+++ b/substrate/srml/scored-pool/Cargo.toml
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 serde = { version = "1.0", optional = true }
 sr-io = { path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-sr-std = { path = "../../core/sr-std", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 srml-support = { path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
@@ -24,7 +24,7 @@ std = [
 	"serde",
 	"sr-io/std",
 	"sr-primitives/std",
-	"sr-std/std",
+	"rstd/std",
 	"srml-support/std",
 	"system/std",
 ]
diff --git a/substrate/srml/scored-pool/src/lib.rs b/substrate/srml/scored-pool/src/lib.rs
index f3ea075653..dc27b3bba9 100644
--- a/substrate/srml/scored-pool/src/lib.rs
+++ b/substrate/srml/scored-pool/src/lib.rs
@@ -89,7 +89,7 @@ mod mock;
 mod tests;
 
 use codec::{Encode, Decode};
-use sr_std::prelude::*;
+use rstd::prelude::*;
 use srml_support::{
 	StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure,
 	traits::{ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
@@ -171,7 +171,7 @@ decl_storage! {
 	}
 	add_extra_genesis {
 		config(members): Vec<T::AccountId>;
-		config(phantom): sr_std::marker::PhantomData<I>;
+		config(phantom): rstd::marker::PhantomData<I>;
 		build(|config| {
 			let mut pool = config.pool.clone();
 
@@ -214,7 +214,7 @@ decl_event!(
 		/// See the transaction for who.
 		CandidateScored,
 		/// Phantom member, never used.
-		Dummy(sr_std::marker::PhantomData<(AccountId, I)>),
+		Dummy(rstd::marker::PhantomData<(AccountId, I)>),
 	}
 );
 
diff --git a/substrate/srml/sudo/Cargo.toml b/substrate/srml/sudo/Cargo.toml
index d0e2d5dbc5..4ce20b0421 100644
--- a/substrate/srml/sudo/Cargo.toml
+++ b/substrate/srml/sudo/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-sr-std = { path = "../../core/sr-std", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-io = { path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 srml-support = { path = "../support", default-features = false }
@@ -23,7 +23,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
-	"sr-std/std",
+	"rstd/std",
 	"sr-io/std",
 	"sr-primitives/std",
 	"srml-support/std",
diff --git a/substrate/srml/sudo/src/lib.rs b/substrate/srml/sudo/src/lib.rs
index d91f61bd2f..0a71d4d628 100644
--- a/substrate/srml/sudo/src/lib.rs
+++ b/substrate/srml/sudo/src/lib.rs
@@ -86,7 +86,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use sr_std::prelude::*;
+use rstd::prelude::*;
 use sr_primitives::traits::StaticLookup;
 use sr_primitives::weights::SimpleDispatchInfo;
 use srml_support::{
diff --git a/substrate/srml/support/Cargo.toml b/substrate/srml/support/Cargo.toml
index cf8c90993a..107a0683da 100644
--- a/substrate/srml/support/Cargo.toml
+++ b/substrate/srml/support/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = ["derive"] }
 srml-metadata = { path = "../metadata", default-features = false }
-sr-std = { path = "../../core/sr-std", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
@@ -30,7 +30,7 @@ std = [
 	"serde",
 	"runtime_io/std",
 	"codec/std",
-	"sr-std/std",
+	"rstd/std",
 	"sr-primitives/std",
 	"srml-metadata/std",
 	"inherents/std",
diff --git a/substrate/srml/support/src/double_map.rs b/substrate/srml/support/src/double_map.rs
index aec7f497a6..c3fea95a6c 100644
--- a/substrate/srml/support/src/double_map.rs
+++ b/substrate/srml/support/src/double_map.rs
@@ -19,7 +19,7 @@
 use crate::rstd::prelude::*;
 use crate::codec::{Codec, Encode};
 use crate::storage::unhashed;
-use sr_std::borrow::Borrow;
+use rstd::borrow::Borrow;
 
 /// An implementation of a map with a two keys.
 ///
diff --git a/substrate/srml/support/src/lib.rs b/substrate/srml/support/src/lib.rs
index 6795603ade..e7386930b9 100644
--- a/substrate/srml/support/src/lib.rs
+++ b/substrate/srml/support/src/lib.rs
@@ -27,7 +27,7 @@ extern crate bitmask;
 #[cfg(feature = "std")]
 pub use serde;
 #[doc(hidden)]
-pub use sr_std as rstd;
+pub use rstd;
 #[doc(hidden)]
 pub use codec;
 #[cfg(feature = "std")]
diff --git a/substrate/srml/support/src/storage/generator/double_map.rs b/substrate/srml/support/src/storage/generator/double_map.rs
index a1898c3b88..46361340ac 100644
--- a/substrate/srml/support/src/storage/generator/double_map.rs
+++ b/substrate/srml/support/src/storage/generator/double_map.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use sr_std::prelude::*;
+use rstd::prelude::*;
 use codec::{Codec, Encode, EncodeAppend};
 use crate::{storage::{self, unhashed, hashed::StorageHasher}, rstd::borrow::Borrow};
 
diff --git a/substrate/srml/support/src/storage/generator/linked_map.rs b/substrate/srml/support/src/storage/generator/linked_map.rs
index b087cf42f5..e1786d2120 100644
--- a/substrate/srml/support/src/storage/generator/linked_map.rs
+++ b/substrate/srml/support/src/storage/generator/linked_map.rs
@@ -16,7 +16,7 @@
 
 use codec::{Codec, Encode, Decode};
 use crate::{storage::{self, unhashed, hashed::StorageHasher}, traits::Len};
-use sr_std::{
+use rstd::{
 	borrow::Borrow,
 	marker::PhantomData,
 };
diff --git a/substrate/srml/support/src/storage/generator/map.rs b/substrate/srml/support/src/storage/generator/map.rs
index 1d660da3b4..48b8cc097f 100644
--- a/substrate/srml/support/src/storage/generator/map.rs
+++ b/substrate/srml/support/src/storage/generator/map.rs
@@ -15,8 +15,8 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 #[cfg(not(feature = "std"))]
-use sr_std::prelude::*;
-use sr_std::borrow::Borrow;
+use rstd::prelude::*;
+use rstd::borrow::Borrow;
 use codec::{Codec, Encode};
 use crate::{storage::{self, unhashed, hashed::StorageHasher}, traits::Len};
 
diff --git a/substrate/srml/support/src/storage/generator/value.rs b/substrate/srml/support/src/storage/generator/value.rs
index 32b4a195c8..69851db1a0 100644
--- a/substrate/srml/support/src/storage/generator/value.rs
+++ b/substrate/srml/support/src/storage/generator/value.rs
@@ -15,8 +15,8 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 #[cfg(not(feature = "std"))]
-use sr_std::prelude::*;
-use sr_std::{borrow::Borrow, iter::FromIterator};
+use rstd::prelude::*;
+use rstd::{borrow::Borrow, iter::FromIterator};
 use codec::{Codec, Encode};
 use crate::{storage::{self, unhashed, hashed::{Twox128, StorageHasher}}, traits::Len};