diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index b84562b8a9..38f0712010 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -195,7 +195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "ed25519"
 version = "0.1.0"
 dependencies = [
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -827,7 +827,7 @@ version = "0.1.0"
 dependencies = [
  "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-runtime-std 0.1.0",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-codec 0.1.0",
@@ -988,7 +988,7 @@ dependencies = [
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-client 0.1.0",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-rpc-servers 0.1.0",
  "substrate-executor 0.1.0",
 ]
@@ -1003,7 +1003,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-runtime 0.1.0",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-serializer 0.1.0",
  "polkadot-state-machine 0.1.0",
  "substrate-codec 0.1.0",
@@ -1016,7 +1016,7 @@ name = "polkadot-collator"
 version = "0.1.0"
 dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
 ]
 
 [[package]]
@@ -1033,7 +1033,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-client 0.1.0",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-serializer 0.1.0",
  "polkadot-state-machine 0.1.0",
  "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1045,7 +1045,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-primitives"
+name = "substrate-primitives"
 version = "0.1.0"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1071,7 +1071,7 @@ dependencies = [
  "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)",
  "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)",
  "polkadot-client 0.1.0",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-state-machine 0.1.0",
  "substrate-executor 0.1.0",
 ]
@@ -1091,7 +1091,7 @@ version = "0.1.0"
 dependencies = [
  "ed25519 0.1.0",
  "environmental 0.1.0",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-state-machine 0.1.0",
  "pwasm-alloc 0.1.0",
  "pwasm-libc 0.1.0",
@@ -1117,7 +1117,7 @@ dependencies = [
  "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memorydb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1126,7 +1126,7 @@ name = "polkadot-validator"
 version = "0.1.0"
 dependencies = [
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-serializer 0.1.0",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1464,7 +1464,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-runtime 0.1.0",
  "parity-wasm 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-runtime-std 0.1.0",
  "polkadot-serializer 0.1.0",
  "polkadot-state-machine 0.1.0",
diff --git a/substrate/cli/Cargo.toml b/substrate/cli/Cargo.toml
index 6ad69c3717..74299ec2eb 100644
--- a/substrate/cli/Cargo.toml
+++ b/substrate/cli/Cargo.toml
@@ -11,5 +11,5 @@ error-chain = "0.11"
 log = "0.3"
 polkadot-client = { path = "../client" }
 substrate-executor = { path = "../executor" }
-polkadot-primitives = { path = "../primitives" }
+substrate-primitives = { path = "../primitives" }
 polkadot-rpc-servers = { path = "../rpc-servers" }
diff --git a/substrate/cli/src/lib.rs b/substrate/cli/src/lib.rs
index db6ba224ad..faad72526e 100644
--- a/substrate/cli/src/lib.rs
+++ b/substrate/cli/src/lib.rs
@@ -21,7 +21,7 @@
 extern crate env_logger;
 extern crate polkadot_client as client;
 extern crate substrate_executor as executor;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate polkadot_rpc_servers as rpc;
 
 #[macro_use]
diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml
index ef2f85f082..313b48cce3 100644
--- a/substrate/client/Cargo.toml
+++ b/substrate/client/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 error-chain = "0.11"
 log = "0.3"
 parking_lot = "0.4"
-polkadot-primitives = { path = "../primitives", version = "0.1" }
+substrate-primitives = { path = "../primitives", version = "0.1" }
 polkadot-state-machine = { path = "../state-machine", version = "0.1" }
 polkadot-serializer = { path = "../serializer" }
 substrate-executor = { path = "../executor" }
diff --git a/substrate/client/src/lib.rs b/substrate/client/src/lib.rs
index b53ca407ab..02bc273cac 100644
--- a/substrate/client/src/lib.rs
+++ b/substrate/client/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![warn(missing_docs)]
 
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate polkadot_state_machine as state_machine;
 extern crate polkadot_serializer as ser;
 extern crate substrate_codec as codec;
diff --git a/substrate/collator/Cargo.toml b/substrate/collator/Cargo.toml
index 71e2606f67..1f612ca85a 100644
--- a/substrate/collator/Cargo.toml
+++ b/substrate/collator/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["Parity Technologies <rphmeier@gmail.com>"]
 description = "Abstract collation logic"
 
 [dependencies]
-polkadot-primitives = { path = "../primitives", version = "0.1" }
+substrate-primitives = { path = "../primitives", version = "0.1" }
 futures = "0.1.17"
diff --git a/substrate/collator/src/lib.rs b/substrate/collator/src/lib.rs
index 044050e79b..da16e7520e 100644
--- a/substrate/collator/src/lib.rs
+++ b/substrate/collator/src/lib.rs
@@ -45,7 +45,7 @@
 //! to be performed, as the collation logic itself.
 
 extern crate futures;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 
 use std::collections::{BTreeSet, BTreeMap};
 
diff --git a/substrate/ed25519/Cargo.toml b/substrate/ed25519/Cargo.toml
index e6ba80d9a5..6d11f67920 100644
--- a/substrate/ed25519/Cargo.toml
+++ b/substrate/ed25519/Cargo.toml
@@ -6,5 +6,5 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ring = "0.12"
 untrusted = "0.5"
-polkadot-primitives = { version = "0.1", path = "../primitives" }
+substrate-primitives = { version = "0.1", path = "../primitives" }
 rustc-hex = "1.0"
diff --git a/substrate/ed25519/src/lib.rs b/substrate/ed25519/src/lib.rs
index 33c25895b7..287d83e36d 100644
--- a/substrate/ed25519/src/lib.rs
+++ b/substrate/ed25519/src/lib.rs
@@ -17,7 +17,7 @@
 //! Simple Ed25519 API.
 
 extern crate ring;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate untrusted;
 extern crate rustc_hex;
 
diff --git a/substrate/executor/src/lib.rs b/substrate/executor/src/lib.rs
index 79b212eb2e..cb754a93f5 100644
--- a/substrate/executor/src/lib.rs
+++ b/substrate/executor/src/lib.rs
@@ -29,7 +29,7 @@
 
 extern crate substrate_codec as codec;
 extern crate polkadot_runtime_std as runtime_std;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate polkadot_serializer as serializer;
 extern crate polkadot_state_machine as state_machine;
 extern crate ed25519;
diff --git a/substrate/native-runtime/Cargo.toml b/substrate/native-runtime/Cargo.toml
index b985aa17a9..90c4bdee72 100644
--- a/substrate/native-runtime/Cargo.toml
+++ b/substrate/native-runtime/Cargo.toml
@@ -6,11 +6,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 substrate-codec = { path = "../codec", version = "0.1" }
 polkadot-runtime-std = { path = "../runtime-std", version = "0.1" }
-polkadot-primitives = { path = "../primitives", version = "0.1" }
+substrate-primitives = { path = "../primitives", version = "0.1" }
 rustc-hex = "1.0"
 hex-literal = "0.1.0"
 log = { version = "0.3", optional = true }
 
 [features]
 default = ["std"]
-std = ["substrate-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std", "log"]
+std = ["substrate-codec/std", "polkadot-runtime-std/std", "substrate-primitives/std", "log"]
diff --git a/substrate/network/Cargo.toml b/substrate/network/Cargo.toml
index d3b62e4a4c..4a49ae5283 100644
--- a/substrate/network/Cargo.toml
+++ b/substrate/network/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ethcore-network = { git = "https://github.com/paritytech/parity.git" }
 ethcore-io = { git = "https://github.com/paritytech/parity.git" }
-polkadot-primitives = { path = "../primitives" }
+substrate-primitives = { path = "../primitives" }
 polkadot-client = { path = "../client" }
 polkadot-state-machine = { path = "../state-machine" }
 polkadot-serializer = { path = "../serializer" }
diff --git a/substrate/network/src/lib.rs b/substrate/network/src/lib.rs
index df06532289..0116363dca 100644
--- a/substrate/network/src/lib.rs
+++ b/substrate/network/src/lib.rs
@@ -27,7 +27,7 @@ extern crate semver;
 extern crate parking_lot;
 extern crate smallvec;
 extern crate ipnetwork;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate polkadot_client as client;
 extern crate polkadot_state_machine as state_machine;
 extern crate polkadot_serializer as ser;
diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml
index 7fc2544f61..4339977804 100644
--- a/substrate/primitives/Cargo.toml
+++ b/substrate/primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "polkadot-primitives"
+name = "substrate-primitives"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
diff --git a/substrate/rpc/Cargo.toml b/substrate/rpc/Cargo.toml
index a2afb0c118..a19dc5353c 100644
--- a/substrate/rpc/Cargo.toml
+++ b/substrate/rpc/Cargo.toml
@@ -8,7 +8,7 @@ error-chain = "0.11"
 jsonrpc-core = { git="https://github.com/paritytech/jsonrpc.git" }
 jsonrpc-macros = { git="https://github.com/paritytech/jsonrpc.git" }
 polkadot-client = { path = "../client" }
-polkadot-primitives = { path = "../primitives" }
+substrate-primitives = { path = "../primitives" }
 polkadot-state-machine = { path = "../state-machine" }
 
 [dev-dependencies]
diff --git a/substrate/rpc/src/lib.rs b/substrate/rpc/src/lib.rs
index 2feef148c5..701eed9ff9 100644
--- a/substrate/rpc/src/lib.rs
+++ b/substrate/rpc/src/lib.rs
@@ -20,7 +20,7 @@
 
 extern crate jsonrpc_core as rpc;
 extern crate polkadot_client as client;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate polkadot_state_machine as state_machine;
 
 #[macro_use]
diff --git a/substrate/runtime-std/Cargo.toml b/substrate/runtime-std/Cargo.toml
index b88baee4f1..badf3355fb 100644
--- a/substrate/runtime-std/Cargo.toml
+++ b/substrate/runtime-std/Cargo.toml
@@ -12,7 +12,7 @@ pwasm-alloc = { path = "../wasm-runtime/pwasm-alloc", version = "0.1" }
 pwasm-libc = { path = "../wasm-runtime/pwasm-libc", version = "0.1" }
 environmental = { path = "../environmental", version = "0.1", optional = true }
 polkadot-state-machine = { path = "../state-machine", version = "0.1", optional = true }
-polkadot-primitives = { path = "../primitives", version = "0.1", default_features = false }
+substrate-primitives = { path = "../primitives", version = "0.1", default_features = false }
 substrate-codec = { path = "../codec", version = "0.1", default_features = false }
 triehash = { version = "0.1", optional = true }
 ed25519 = { path = "../ed25519", version = "0.1", optional = true }
@@ -23,7 +23,7 @@ std = [
 	"environmental",
 	"polkadot-state-machine",
 	"triehash",
-	"polkadot-primitives/std",
+	"substrate-primitives/std",
 	"substrate-codec/std",
 	"ed25519",
 ]
diff --git a/substrate/runtime-std/with_std.rs b/substrate/runtime-std/with_std.rs
index d03cf840fc..9c4cb5e1bd 100644
--- a/substrate/runtime-std/with_std.rs
+++ b/substrate/runtime-std/with_std.rs
@@ -18,7 +18,7 @@
 extern crate environmental;
 
 extern crate polkadot_state_machine;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate triehash;
 extern crate ed25519;
 
diff --git a/substrate/runtime-std/without_std.rs b/substrate/runtime-std/without_std.rs
index f599f6c3d2..6176012370 100644
--- a/substrate/runtime-std/without_std.rs
+++ b/substrate/runtime-std/without_std.rs
@@ -6,7 +6,7 @@ extern crate pwasm_libc;
 #[cfg(feature = "nightly")]
 extern crate pwasm_alloc;
 
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 
 pub use alloc::vec;
 pub use alloc::boxed;
diff --git a/substrate/state-machine/Cargo.toml b/substrate/state-machine/Cargo.toml
index 65c6feed54..d326d1f6a9 100644
--- a/substrate/state-machine/Cargo.toml
+++ b/substrate/state-machine/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot State Machine"
 
 [dependencies]
-polkadot-primitives = { path = "../primitives", version = "0.1.0" }
+substrate-primitives = { path = "../primitives", version = "0.1.0" }
 hashdb = "0.1.1"
 patricia-trie = "0.1.0"
 memorydb = "0.1.1"
diff --git a/substrate/state-machine/src/lib.rs b/substrate/state-machine/src/lib.rs
index 386c5da20a..6998153f82 100644
--- a/substrate/state-machine/src/lib.rs
+++ b/substrate/state-machine/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![warn(missing_docs)]
 
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 
 #[cfg_attr(test, macro_use)]
 extern crate hex_literal;
diff --git a/substrate/validator/Cargo.toml b/substrate/validator/Cargo.toml
index 39096165d5..ca69e1a98f 100644
--- a/substrate/validator/Cargo.toml
+++ b/substrate/validator/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 error-chain = "0.11"
-polkadot-primitives = { path = "../primitives", version = "0.1" }
+substrate-primitives = { path = "../primitives", version = "0.1" }
 polkadot-serializer = { path = "../serializer", version = "0.1" }
 serde = "1.0"
diff --git a/substrate/validator/src/lib.rs b/substrate/validator/src/lib.rs
index 131a4861aa..778db0155b 100644
--- a/substrate/validator/src/lib.rs
+++ b/substrate/validator/src/lib.rs
@@ -18,7 +18,7 @@
 
 #[warn(missing_docs)]
 
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 extern crate polkadot_serializer as serializer;
 extern crate serde;
 
diff --git a/substrate/wasm-runtime/Cargo.lock b/substrate/wasm-runtime/Cargo.lock
index f807d33069..b8a9b800fc 100644
--- a/substrate/wasm-runtime/Cargo.lock
+++ b/substrate/wasm-runtime/Cargo.lock
@@ -92,7 +92,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "ed25519"
 version = "0.1.0"
 dependencies = [
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -376,7 +376,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-primitives"
+name = "substrate-primitives"
 version = "0.1.0"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -397,7 +397,7 @@ version = "0.1.0"
 dependencies = [
  "ed25519 0.1.0",
  "environmental 0.1.0",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-state-machine 0.1.0",
  "pwasm-alloc 0.1.0",
  "pwasm-libc 0.1.0",
@@ -415,7 +415,7 @@ dependencies = [
  "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memorydb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -547,7 +547,7 @@ dependencies = [
 name = "runtime-polkadot"
 version = "0.1.0"
 dependencies = [
- "polkadot-primitives 0.1.0",
+ "substrate-primitives 0.1.0",
  "polkadot-runtime-std 0.1.0",
  "substrate-codec 0.1.0",
 ]
diff --git a/substrate/wasm-runtime/polkadot/Cargo.toml b/substrate/wasm-runtime/polkadot/Cargo.toml
index 45b8c711e6..1bd0618a91 100644
--- a/substrate/wasm-runtime/polkadot/Cargo.toml
+++ b/substrate/wasm-runtime/polkadot/Cargo.toml
@@ -9,8 +9,8 @@ crate-type = ["cdylib"]
 [dependencies]
 substrate-codec = { path = "../../codec", version = "0.1", default-features = false }
 polkadot-runtime-std = { path = "../../runtime-std", version = "0.1", default-features = false }
-polkadot-primitives = { path = "../../primitives", version = "0.1", default-features = false }
+substrate-primitives = { path = "../../primitives", version = "0.1", default-features = false }
 
 [features]
 default = []
-std = ["substrate-codec/std", "polkadot-runtime-std/std", "polkadot-primitives/std"]
+std = ["substrate-codec/std", "polkadot-runtime-std/std", "substrate-primitives/std"]
diff --git a/substrate/wasm-runtime/polkadot/src/lib.rs b/substrate/wasm-runtime/polkadot/src/lib.rs
index 098fdd09a7..81b0e0c032 100644
--- a/substrate/wasm-runtime/polkadot/src/lib.rs
+++ b/substrate/wasm-runtime/polkadot/src/lib.rs
@@ -28,7 +28,7 @@ extern crate rustc_hex;
 extern crate log;
 
 extern crate substrate_codec as codec;
-extern crate polkadot_primitives as primitives;
+extern crate substrate_primitives as primitives;
 
 #[cfg(test)]
 #[macro_use]