diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index 473ca7556d0daffd00a79f6fd55cd87a13a9f9ea..76bbdf1da5a47e58a9f5f387895d7994ce5a3a70 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
 rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
 
 frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -18,7 +18,7 @@ orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git", default-features = false }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
@@ -28,7 +28,7 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"rstd/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index 020d3a176b6d3d28bff17f7744ba8efe55ed01c4..7c840204fb5ee699871bc6186d6c529b804ab3ae 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -17,7 +17,7 @@ frame-system = { git = "https://github.com/paritytech/substrate.git", default-fe
 orml-traits = { path = "../traits", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git", default-features = false }
 pallet-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate.git" }
 tokens = { package = "orml-tokens", path = "../tokens" }
 
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index 04d335a93194c92920347e90c7c30a5dad9e9da0..2a7a9ce620e5287fe329b8925795c55aaf6b86a2 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -8,9 +8,8 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
 rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
-primitives = { git = "https://github.com/paritytech/substrate.git", package = "substrate-primitives", default-features = false }
 
 frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -19,6 +18,7 @@ orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
+primitives = { git = "https://github.com/paritytech/substrate.git", package = "substrate-primitives", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate.git" }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
@@ -29,11 +29,10 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"rstd/std",
-	"primitives/std",
 	"frame-support/std",
 	"frame-system/std",
-	"orml-utilities/std",
 	"orml-traits/std",
+	"orml-utilities/std",
 ]
diff --git a/prices/Cargo.toml b/prices/Cargo.toml
index 105ae03b6826ff6cec3f06728c30e7e0149bc3fb..9bc04f821169dce6db623fc26335c2e444a43e72 100644
--- a/prices/Cargo.toml
+++ b/prices/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
 
 frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -17,7 +17,7 @@ orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git", default-features = false }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
@@ -26,7 +26,7 @@ default = ["std"]
 std = [
 	"serde",
 	"codec/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"sr-primitives/std",
 	"frame-support/std",
 	"frame-system/std",
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 1bd4d970cdda40d47bd4358605a11c91bc915679..825db7d7469b50483e8b2be18ea19830777feaf7 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -18,7 +18,7 @@ orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives",  git = "https://github.com/paritytech/substrate.git", default-features = false }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 11b536e4286a3819210ed8442936e7d9dd9f825d..036590f3b04f70942dfe6d8c3b00ae186075af9c 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -8,14 +8,12 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
 rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
 num-traits = { version = "0.2.8", default-features = false }
 impl-trait-for-tuples = "0.1.3"
 
-frame_support = { package = "frame-support", git = "https://github.com/paritytech/substrate.git" }
-frame_system = { package = "frame-system", git = "https://github.com/paritytech/substrate.git" }
-
+[dev-dependencies]
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
 [features]
@@ -24,9 +22,7 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"rstd/std",
 	"num-traits/std",
-	"frame_support/std",
-	"frame_system/std",
 ]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index 94073843dcd332db1624581a66ad93e00782c71f..59772f20b631ccb8dad528f713861b5badf3334d 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
 rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
 
 frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -25,7 +25,7 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"rstd/std",
 	"frame-support/std",
 	"frame-system/std",