diff --git a/Cargo.lock b/Cargo.lock
index 993b4bdd6be3..08ee2e560409 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1804,7 +1804,7 @@ dependencies = [
  "srml-treasury 0.1.0",
  "srml-upgrade-key 0.1.0",
  "substrate-client 0.1.0",
- "substrate-fg-primitives 0.1.0",
+ "substrate-finality-grandpa-primitives 0.1.0",
  "substrate-keyring 0.1.0",
  "substrate-primitives 0.1.0",
 ]
@@ -3180,18 +3180,6 @@ dependencies = [
  "wasmi 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "substrate-fg-primitives"
-version = "0.1.0"
-dependencies = [
- "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 0.1.0",
- "sr-std 0.1.0",
- "substrate-client 0.1.0",
- "substrate-primitives 0.1.0",
-]
-
 [[package]]
 name = "substrate-finality-grandpa"
 version = "0.1.0"
@@ -3206,7 +3194,7 @@ dependencies = [
  "sr-primitives 0.1.0",
  "substrate-client 0.1.0",
  "substrate-consensus-common 0.1.0",
- "substrate-fg-primitives 0.1.0",
+ "substrate-finality-grandpa-primitives 0.1.0",
  "substrate-keyring 0.1.0",
  "substrate-network 0.1.0",
  "substrate-primitives 0.1.0",
@@ -3214,6 +3202,18 @@ dependencies = [
  "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "substrate-finality-grandpa-primitives"
+version = "0.1.0"
+dependencies = [
+ "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-primitives 0.1.0",
+ "sr-std 0.1.0",
+ "substrate-client 0.1.0",
+ "substrate-primitives 0.1.0",
+]
+
 [[package]]
 name = "substrate-keyring"
 version = "0.1.0"
diff --git a/core/finality-grandpa/Cargo.toml b/core/finality-grandpa/Cargo.toml
index a4b20e51777b..9c03c2bc1018 100644
--- a/core/finality-grandpa/Cargo.toml
+++ b/core/finality-grandpa/Cargo.toml
@@ -14,7 +14,7 @@ substrate-client = { path = "../client" }
 log = "0.4"
 parking_lot = "0.4"
 tokio = "0.1.7"
-substrate-fg-primitives = { path = "primitives" }
+substrate-finality-grandpa-primitives = { path = "primitives" }
 
 [dependencies.finality-grandpa]
 version = "0.3.0"
diff --git a/core/finality-grandpa/primitives/Cargo.toml b/core/finality-grandpa/primitives/Cargo.toml
index 8f9c6628b86d..0ddb489af77c 100644
--- a/core/finality-grandpa/primitives/Cargo.toml
+++ b/core/finality-grandpa/primitives/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "substrate-fg-primitives"
+name = "substrate-finality-grandpa-primitives"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
diff --git a/core/finality-grandpa/src/lib.rs b/core/finality-grandpa/src/lib.rs
index 6a70b3dfcac0..85f2377670a5 100644
--- a/core/finality-grandpa/src/lib.rs
+++ b/core/finality-grandpa/src/lib.rs
@@ -59,7 +59,7 @@ extern crate substrate_primitives;
 extern crate tokio;
 extern crate parking_lot;
 extern crate parity_codec as codec;
-extern crate substrate_fg_primitives as fg_primitives;
+extern crate substrate_finality_grandpa_primitives as fg_primitives;
 
 #[macro_use]
 extern crate log;
diff --git a/node/runtime/Cargo.toml b/node/runtime/Cargo.toml
index 586592789366..6faf6fc64e2c 100644
--- a/node/runtime/Cargo.toml
+++ b/node/runtime/Cargo.toml
@@ -14,7 +14,7 @@ parity-codec-derive = "2.1"
 sr-std = { path = "../../core/sr-std" }
 srml-support = { path = "../../srml/support" }
 substrate-primitives = { path = "../../core/primitives" }
-substrate-fg-primitives = { path = "../../core/finality-grandpa/primitives" }
+substrate-finality-grandpa-primitives = { path = "../../core/finality-grandpa/primitives" }
 substrate-client = { path = "../../core/client" }
 substrate-keyring = { path = "../../core/keyring" }
 srml-balances = { path = "../../srml/balances" }
@@ -59,5 +59,5 @@ std = [
 	"serde/std",
 	"safe-mix/std",
 	"substrate-client/std",
-	"substrate-fg-primitives/std",
+	"substrate-finality-grandpa-primitives/std",
 ]
diff --git a/node/runtime/src/lib.rs b/node/runtime/src/lib.rs
index 41595889dad4..90306a8e5236 100644
--- a/node/runtime/src/lib.rs
+++ b/node/runtime/src/lib.rs
@@ -56,7 +56,7 @@ extern crate srml_upgrade_key as upgrade_key;
 #[macro_use]
 extern crate sr_version as version;
 extern crate node_primitives;
-extern crate substrate_fg_primitives;
+extern crate substrate_finality_grandpa_primitives;
 
 #[cfg(feature = "std")]
 use codec::{Encode, Decode};
@@ -85,7 +85,7 @@ use council::seats as council_seats;
 #[cfg(any(feature = "std", test))]
 use version::NativeVersion;
 use substrate_primitives::OpaqueMetadata;
-use substrate_fg_primitives::{runtime::GrandpaApi, ScheduledChange};
+use substrate_finality_grandpa_primitives::{runtime::GrandpaApi, ScheduledChange};
 
 #[cfg(any(feature = "std", test))]
 pub use runtime_primitives::BuildStorage;
@@ -398,7 +398,7 @@ impl client::runtime_api::Metadata<GBlock> for ClientWithApi {
 }
 
 #[cfg(feature = "std")]
-impl substrate_fg_primitives::GrandpaApi<GBlock> for ClientWithApi {
+impl substrate_finality_grandpa_primitives::GrandpaApi<GBlock> for ClientWithApi {
 	fn grandpa_pending_change(&self, at: &GBlockId, digest: &DigestFor<GBlock>)
 		-> Result<Option<ScheduledChange<NumberFor<GBlock>>>, client::error::Error> {
 		self.call_api_at(at, "grandpa_pending_change", digest)
diff --git a/node/runtime/wasm/Cargo.lock b/node/runtime/wasm/Cargo.lock
index 4eeae1fd9da8..d34062848879 100644
--- a/node/runtime/wasm/Cargo.lock
+++ b/node/runtime/wasm/Cargo.lock
@@ -526,7 +526,7 @@ dependencies = [
  "srml-treasury 0.1.0",
  "srml-upgrade-key 0.1.0",
  "substrate-client 0.1.0",
- "substrate-fg-primitives 0.1.0",
+ "substrate-finality-grandpa-primitives 0.1.0",
  "substrate-primitives 0.1.0",
 ]
 
@@ -1274,7 +1274,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "substrate-fg-primitives"
+name = "substrate-finality-grandpa-primitives"
 version = "0.1.0"
 dependencies = [
  "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/node/runtime/wasm/Cargo.toml b/node/runtime/wasm/Cargo.toml
index 6e9cfd091079..50f9da359276 100644
--- a/node/runtime/wasm/Cargo.toml
+++ b/node/runtime/wasm/Cargo.toml
@@ -12,7 +12,7 @@ safe-mix = { version = "1.0", default-features = false }
 parity-codec-derive = { version = "2.1" }
 parity-codec = { version = "2.1", default-features = false }
 substrate-primitives = { path = "../../../core/primitives", default-features = false }
-substrate-fg-primitives = { path = "../../../core/finality-grandpa/primitives", default-features = false }
+substrate-finality-grandpa-primitives = { path = "../../../core/finality-grandpa/primitives", default-features = false }
 substrate-client = { path = "../../../core/client", default-features = false }
 sr-std = { path = "../../../core/sr-std", default-features = false }
 srml-support = { path = "../../../srml/support", default-features = false }
@@ -39,7 +39,7 @@ std = [
 	"parity-codec/std",
 	"substrate-primitives/std",
 	"substrate-client/std",
-	"substrate-fg-primitives/std",
+	"substrate-finality-grandpa-primitives/std",
 	"sr-std/std",
 	"srml-support/std",
 	"srml-balances/std",