diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs
index ef70dd300..dbbfbbea4 100644
--- a/beacon_node/src/main.rs
+++ b/beacon_node/src/main.rs
@@ -10,8 +10,8 @@ use std::path::PathBuf;
 
 pub const DEFAULT_DATA_DIR: &str = ".lighthouse";
 
-pub const CLIENT_CONFIG_FILENAME: &str = "client_config.toml";
-pub const ETH2_CONFIG_FILENAME: &str = "eth2_config.toml";
+pub const CLIENT_CONFIG_FILENAME: &str = "becaon-node.toml";
+pub const ETH2_CONFIG_FILENAME: &str = "eth2-spec.toml";
 
 fn main() {
     let decorator = slog_term::TermDecorator::new().build();
diff --git a/validator_client/src/main.rs b/validator_client/src/main.rs
index 8a07894d5..6a310cddb 100644
--- a/validator_client/src/main.rs
+++ b/validator_client/src/main.rs
@@ -17,8 +17,8 @@ use types::{Keypair, MainnetEthSpec, MinimalEthSpec};
 
 pub const DEFAULT_SPEC: &str = "minimal";
 pub const DEFAULT_DATA_DIR: &str = ".lighthouse-validator";
-pub const CLIENT_CONFIG_FILENAME: &str = "client-config.toml";
-pub const ETH2_CONFIG_FILENAME: &str = "eth2-config.toml";
+pub const CLIENT_CONFIG_FILENAME: &str = "validator-client.toml";
+pub const ETH2_CONFIG_FILENAME: &str = "eth2-spec.toml";
 
 fn main() {
     // Logging