diff --git a/beacon_node/src/config.rs b/beacon_node/src/config.rs
index c8a9299a5..0aa2d29bd 100644
--- a/beacon_node/src/config.rs
+++ b/beacon_node/src/config.rs
@@ -76,10 +76,10 @@ fn process_testnet_subcommand(
         builder.update_spec_from_subcommand(&cli_args)?;
     }
 
-    if let Some(path_string) = cli_args.value_of("config") {
+    if let Some(path_string) = cli_args.value_of("client-config") {
         let path = path_string
             .parse::<PathBuf>()
-            .map_err(|e| format!("Unable to parse config path: {:?}", e))?;
+            .map_err(|e| format!("Unable to parse client config path: {:?}", e))?;
         builder.load_client_config(path)?;
     }
 
diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs
index a9659362c..243e4b716 100644
--- a/beacon_node/src/main.rs
+++ b/beacon_node/src/main.rs
@@ -209,8 +209,8 @@ fn main() {
                     .conflicts_with("spec")
             )
             .arg(
-                Arg::with_name("config")
-                    .long("config")
+                Arg::with_name("client-config")
+                    .long("client-config")
                     .value_name("TOML_FILE")
                     .help("An existing beacon_node TOML file (e.g., beacon_node.toml).")
                     .takes_value(true)