diff --git a/Cargo.lock b/Cargo.lock
index d73306a..c4e4d21 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -419,7 +419,7 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
 [[package]]
 name = "orchestra"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -436,7 +436,7 @@ dependencies = [
 
 [[package]]
 name = "orchestra-proc-macro"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "assert_matches",
  "expander",
diff --git a/Cargo.toml b/Cargo.toml
index 8233196..b96f091 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ members = ["orchestra", "metered-channel", "orchestra/proc-macro"]
 [workspace.package]
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
-version = "0.0.5"
+version = "0.0.6"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/paritytech/orchestra"
diff --git a/orchestra/Cargo.toml b/orchestra/Cargo.toml
index 6e4c19b..7ecc2f9 100644
--- a/orchestra/Cargo.toml
+++ b/orchestra/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3"
 async-trait = "0.1"
 thiserror = "1"
 metered = { package = "prioritized-metered-channel", version = "0.2.0", path = "../metered-channel" }
-orchestra-proc-macro = { version = "0.0.5", path = "./proc-macro" }
+orchestra-proc-macro = { version = "0.0.6", path = "./proc-macro" }
 futures-timer = "3.0.2"
 pin-project = "1.0"
 dyn-clonable = "0.9"
diff --git a/orchestra/proc-macro/src/graph.rs b/orchestra/proc-macro/src/graph.rs
index aeb4807..6e490d0 100644
--- a/orchestra/proc-macro/src/graph.rs
+++ b/orchestra/proc-macro/src/graph.rs
@@ -30,15 +30,15 @@ pub(crate) struct ConnectionGraph<'a> {
 	/// the receiver of the message.
 	pub(crate) graph: Graph<Ident, Path>,
 	/// Cycles within the graph
-	#[cfg_attr(not(feature = "graph"), allow(dead_code))]
+	#[cfg_attr(not(feature = "dotgraph"), allow(dead_code))]
 	pub(crate) sccs: Vec<Vec<NodeIndex>>,
 	/// Messages that are never being sent (and by which subsystem), but are consumed
 	/// Maps the message `Path` to the subsystem `Ident` represented by `NodeIndex`.
-	#[cfg_attr(not(feature = "graph"), allow(dead_code))]
+	#[cfg_attr(not(feature = "dotgraph"), allow(dead_code))]
 	pub(crate) unsent_messages: HashMap<&'a Path, (&'a Ident, NodeIndex)>,
 	/// Messages being sent (and by which subsystem), but not consumed by any subsystem
 	/// Maps the message `Path` to the subsystem `Ident` represented by `NodeIndex`.
-	#[cfg_attr(not(feature = "graph"), allow(dead_code))]
+	#[cfg_attr(not(feature = "dotgraph"), allow(dead_code))]
 	pub(crate) unconsumed_messages: HashMap<&'a Path, Vec<(&'a Ident, NodeIndex)>>,
 }
 
@@ -180,7 +180,7 @@ impl<'a> ConnectionGraph<'a> {
 	/// Render a graphviz (aka dot graph) to a file.
 	///
 	/// Cycles are annotated with the lower
-	#[cfg(feature = "graph")]
+	#[cfg(feature = "dotgraph")]
 	pub(crate) fn graphviz(self, dest: &mut impl std::io::Write) -> std::io::Result<()> {
 		use self::graph_helpers::*;
 		use petgraph::{
@@ -344,7 +344,7 @@ fn greek_alphabet() -> [char; GREEK_ALPHABET_SIZE] {
 	alphabet
 }
 
-#[cfg(feature = "graph")]
+#[cfg(feature = "dotgraph")]
 mod graph_helpers {
 	use super::HashMap;
 
diff --git a/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs b/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
index 23ac2c4..49f0058 100644
--- a/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
+++ b/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
@@ -76,7 +76,7 @@ pub(crate) fn impl_subsystem_types_all(info: &OrchestraInfo) -> Result<TokenStre
 	}
 
 	// Write the graph to file.
-	#[cfg(feature = "graph")]
+	#[cfg(feature = "dotgraph")]
 	{
 		let path = std::path::PathBuf::from(env!("OUT_DIR"))
 			.join(orchestra_name.to_string().to_lowercase() + "-subsystem-messaging.dot");