diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs
index ad7ba14d284e58064a227690ff312d8d29260fe0..77d178ed69c0b7ec93ba67149d48a728e3579bad 100644
--- a/polkadot/cli/src/cli.rs
+++ b/polkadot/cli/src/cli.rs
@@ -26,7 +26,7 @@ use std::path::PathBuf;
 pub enum Subcommand {
 	/// Build a chain specification.
 	#[deprecated(
-		note = "build-spec will be removed after 1/04/2026. Use export-chain-spec instead"
+		note = "build-spec command will be removed after 1/04/2026. Use export-chain-spec command instead"
 	)]
 	BuildSpec(sc_cli::BuildSpecCmd),
 
diff --git a/substrate/bin/node/cli/src/cli.rs b/substrate/bin/node/cli/src/cli.rs
index dc253c5e4e7ef223de59179e935694f01edb4ff2..4910d90cd6bb0639efcdbf38a058c9ef795a8ea6 100644
--- a/substrate/bin/node/cli/src/cli.rs
+++ b/substrate/bin/node/cli/src/cli.rs
@@ -79,7 +79,7 @@ pub enum Subcommand {
 
 	/// Build a chain specification.
 	#[deprecated(
-		note = "build-spec will be removed after 1/04/2026. Use export-chain-spec instead"
+		note = "build-spec command will be removed after 1/04/2026. Use export-chain-spec command instead"
 	)]
 	BuildSpec(sc_cli::BuildSpecCmd),
 
diff --git a/templates/minimal/node/src/cli.rs b/templates/minimal/node/src/cli.rs
index 5f5fb42914d901fdc3d022b6721e990ab361d957..43810321344ced44ea02a978574d423dbc57bf8b 100644
--- a/templates/minimal/node/src/cli.rs
+++ b/templates/minimal/node/src/cli.rs
@@ -60,7 +60,7 @@ pub enum Subcommand {
 
 	/// Build a chain specification.
 	#[deprecated(
-		note = "build-spec will be removed after 1/04/2026. Use export-chain-spec instead"
+		note = "build-spec command will be removed after 1/04/2026. Use export-chain-spec command instead"
 	)]
 	BuildSpec(sc_cli::BuildSpecCmd),
 
diff --git a/templates/parachain/node/src/cli.rs b/templates/parachain/node/src/cli.rs
index 7c8a8d652698e167ab41093161cfed6ca15f4100..cfa1f0d1c797d3286979aed7181d57dbcf73fa84 100644
--- a/templates/parachain/node/src/cli.rs
+++ b/templates/parachain/node/src/cli.rs
@@ -7,7 +7,7 @@ use std::path::PathBuf;
 pub enum Subcommand {
 	/// Build a chain specification.
 	#[deprecated(
-		note = "build-spec will be removed after 1/04/2026. Use export-chain-spec instead"
+		note = "build-spec command will be removed after 1/04/2026. Use export-chain-spec command instead"
 	)]
 	BuildSpec(sc_cli::BuildSpecCmd),
 
diff --git a/templates/solochain/node/src/cli.rs b/templates/solochain/node/src/cli.rs
index 4df320ab187c02ca676b40a20df5d0fe11f4cb98..8b0544793da31cf4dd85012896d21243f3b3d30f 100644
--- a/templates/solochain/node/src/cli.rs
+++ b/templates/solochain/node/src/cli.rs
@@ -16,7 +16,7 @@ pub enum Subcommand {
 
 	/// Build a chain specification.
 	#[deprecated(
-		note = "build-spec will be removed after 1/04/2026. Use export-chain-spec instead"
+		note = "build-spec command will be removed after 1/04/2026. Use export-chain-spec command instead"
 	)]
 	BuildSpec(sc_cli::BuildSpecCmd),