diff --git a/account_manager/src/main.rs b/account_manager/src/main.rs
index ee0e86d602..68c304ec53 100644
--- a/account_manager/src/main.rs
+++ b/account_manager/src/main.rs
@@ -6,7 +6,7 @@ use std::path::PathBuf;
 use types::test_utils::generate_deterministic_keypair;
 use validator_client::Config as ValidatorClientConfig;
 
-pub const DEFAULT_DATA_DIR: &str = ".lighthouse-account-manager";
+pub const DEFAULT_DATA_DIR: &str = ".lighthouse-validator";
 pub const CLIENT_CONFIG_FILENAME: &str = "account-manager.toml";
 
 fn main() {
diff --git a/validator_client/src/main.rs b/validator_client/src/main.rs
index e37b6530ee..5beea4c38c 100644
--- a/validator_client/src/main.rs
+++ b/validator_client/src/main.rs
@@ -36,6 +36,7 @@ fn main() {
         .arg(
             Arg::with_name("datadir")
                 .long("datadir")
+                .short("d")
                 .value_name("DIR")
                 .help("Data directory for keys and databases.")
                 .takes_value(true),