diff --git a/substrate/.maintain/rename-crates-for-2.0.sh b/substrate/.maintain/rename-crates-for-2.0.sh
index cd68abac98..9eefb2918c 100644
--- a/substrate/.maintain/rename-crates-for-2.0.sh
+++ b/substrate/.maintain/rename-crates-for-2.0.sh
@@ -46,7 +46,7 @@ TO_RENAME=(
     "substrate-debug-derive sp-debug-derive"
     "substrate-primitives-storage sp-storage"
     "substrate-externalities sp-externalities"
-    "substrate-finality-grandpa-primitives sp-finality-granpda"
+    "substrate-finality-grandpa-primitives sp-finality-grandpa"
     "substrate-inherents sp-inherents"
     "substrate-keyring sp-keyring"
     "substrate-offchain-primitives sp-offchain"
diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 557d1dd1f2..8ed94ad10e 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -3012,7 +3012,7 @@ dependencies = [
  "sp-consensus 2.0.0",
  "sp-consensus-babe 2.0.0",
  "sp-core 2.0.0",
- "sp-finality-granpda 2.0.0",
+ "sp-finality-grandpa 2.0.0",
  "sp-finality-tracker 2.0.0",
  "sp-inherents 2.0.0",
  "sp-io 2.0.0",
@@ -3179,7 +3179,7 @@ dependencies = [
  "sp-consensus 2.0.0",
  "sp-consensus-aura 2.0.0",
  "sp-core 2.0.0",
- "sp-finality-granpda 2.0.0",
+ "sp-finality-grandpa 2.0.0",
  "sp-inherents 2.0.0",
  "sp-io 2.0.0",
  "sp-runtime 2.0.0",
@@ -3703,7 +3703,7 @@ dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-core 2.0.0",
- "sp-finality-granpda 2.0.0",
+ "sp-finality-grandpa 2.0.0",
  "sp-io 2.0.0",
  "sp-runtime 2.0.0",
  "sp-staking 2.0.0",
@@ -5241,7 +5241,7 @@ dependencies = [
  "sp-consensus 2.0.0",
  "sp-consensus-babe 2.0.0",
  "sp-core 2.0.0",
- "sp-finality-granpda 2.0.0",
+ "sp-finality-grandpa 2.0.0",
  "sp-finality-tracker 2.0.0",
  "sp-inherents 2.0.0",
  "sp-keyring 2.0.0",
@@ -5484,7 +5484,7 @@ dependencies = [
  "sp-consensus 2.0.0",
  "sp-consensus-babe 2.0.0",
  "sp-core 2.0.0",
- "sp-finality-granpda 2.0.0",
+ "sp-finality-grandpa 2.0.0",
  "sp-io 2.0.0",
  "sp-runtime 2.0.0",
  "sp-session 2.0.0",
@@ -6138,7 +6138,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "sp-finality-granpda"
+name = "sp-finality-grandpa"
 version = "2.0.0"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/substrate/bin/node-template/Cargo.toml b/substrate/bin/node-template/Cargo.toml
index bfe39ee0c7..859bedf15d 100644
--- a/substrate/bin/node-template/Cargo.toml
+++ b/substrate/bin/node-template/Cargo.toml
@@ -31,7 +31,7 @@ aura = { package = "sc-consensus-aura", path = "../../client/consensus/aura" }
 aura-primitives = { package = "sp-consensus-aura", path = "../../primitives/consensus/aura" }
 consensus-common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
 grandpa = { package = "sc-finality-grandpa", path = "../../client/finality-grandpa" }
-grandpa-primitives = { package = "sp-finality-granpda", path = "../../primitives/finality-grandpa" }
+grandpa-primitives = { package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 sc-client = {  path = "../../client/" }
 runtime = { package = "node-template-runtime", path = "runtime" }
 sp-runtime = { path = "../../primitives/sr-primitives" }
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index 6b61f7abe0..d3340aa0ae 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -36,7 +36,7 @@ structopt = "0.3.3"
 # primitives
 authority-discovery-primitives = { package = "sp-authority-discovery", path = "../../../primitives/authority-discovery"}
 babe-primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe" }
-grandpa_primitives = { package = "sp-finality-granpda", path = "../../../primitives/finality-grandpa" }
+grandpa_primitives = { package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
 primitives = { package = "sp-core", path = "../../../primitives/core" }
 sp-runtime = { path = "../../../primitives/sr-primitives" }
 sp-timestamp = { path = "../../../primitives/timestamp", default-features = false }
diff --git a/substrate/client/finality-grandpa/Cargo.toml b/substrate/client/finality-grandpa/Cargo.toml
index 8b053fcda6..a1e2c86b8e 100644
--- a/substrate/client/finality-grandpa/Cargo.toml
+++ b/substrate/client/finality-grandpa/Cargo.toml
@@ -26,7 +26,7 @@ inherents = { package = "sp-inherents", path = "../../primitives/inherents" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 network = { package = "sc-network", path = "../network" }
 sp-finality-tracker = { path = "../../primitives/finality-tracker" }
-fg_primitives = { package = "sp-finality-granpda", path = "../../primitives/finality-grandpa" }
+fg_primitives = { package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 grandpa = { package = "finality-grandpa", version = "0.10.1", features = ["derive-codec"] }
 
 [dev-dependencies]
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index e03c263b80..a981daffcf 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -60,5 +60,5 @@ tracing = "0.1.10"
 substrate-test-runtime-client = { path = "../../test/utils/runtime/client" }
 babe-primitives = { package = "sp-consensus-babe", path = "../../primitives/consensus/babe" }
 grandpa = { package = "sc-finality-grandpa", path = "../finality-grandpa" }
-grandpa-primitives = { package = "sp-finality-granpda", path = "../../primitives/finality-grandpa" }
+grandpa-primitives = { package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 tokio = "0.1"
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index d463e216ed..f14da4a395 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
-sp-finality-granpda = { path = "../../primitives/finality-grandpa", default-features = false }
+sp-finality-grandpa = { path = "../../primitives/finality-grandpa", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
@@ -26,7 +26,7 @@ std = [
 	"serde",
 	"codec/std",
 	"primitives/std",
-	"sp-finality-granpda/std",
+	"sp-finality-grandpa/std",
 	"rstd/std",
 	"support/std",
 	"sp-runtime/std",
diff --git a/substrate/frame/grandpa/src/lib.rs b/substrate/frame/grandpa/src/lib.rs
index 0c4c6b202e..12fb28546c 100644
--- a/substrate/frame/grandpa/src/lib.rs
+++ b/substrate/frame/grandpa/src/lib.rs
@@ -28,7 +28,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 // re-export since this is necessary for `impl_apis` in runtime.
-pub use sp_finality_granpda as fg_primitives;
+pub use sp_finality_grandpa as fg_primitives;
 
 use rstd::prelude::*;
 use codec::{self as codec, Encode, Decode, Error};
diff --git a/substrate/frame/grandpa/src/mock.rs b/substrate/frame/grandpa/src/mock.rs
index 75de98cdf9..fb153d71cf 100644
--- a/substrate/frame/grandpa/src/mock.rs
+++ b/substrate/frame/grandpa/src/mock.rs
@@ -24,7 +24,7 @@ use support::{impl_outer_origin, impl_outer_event, parameter_types, weights::Wei
 use primitives::H256;
 use codec::{Encode, Decode};
 use crate::{AuthorityId, AuthorityList, GenesisConfig, Trait, Module, ConsensusLog};
-use sp_finality_granpda::GRANDPA_ENGINE_ID;
+use sp_finality_grandpa::GRANDPA_ENGINE_ID;
 
 impl_outer_origin!{
 	pub enum Origin for Test {}
diff --git a/substrate/primitives/finality-grandpa/Cargo.toml b/substrate/primitives/finality-grandpa/Cargo.toml
index f176702775..f02b8a68d5 100644
--- a/substrate/primitives/finality-grandpa/Cargo.toml
+++ b/substrate/primitives/finality-grandpa/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sp-finality-granpda"
+name = "sp-finality-grandpa"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"