diff --git a/src/cmd_hmac_decrypt.rs b/src/cmd_hmac_decrypt.rs
index 46f16ca..ae6955a 100644
--- a/src/cmd_hmac_decrypt.rs
+++ b/src/cmd_hmac_decrypt.rs
@@ -13,7 +13,7 @@ impl Command for CommandImpl {
 
     fn subcommand<'a>(&self) -> App<'a, 'a> {
         SubCommand::with_name(self.name())
-            .about("Yubikey HMAC decrypt")
+            .about("YubiKey HMAC decrypt")
             .arg(
                 Arg::with_name("ciphertext")
                     .long("ciphertext")
diff --git a/src/cmd_hmac_encrypt.rs b/src/cmd_hmac_encrypt.rs
index 3a9d77c..d36e87c 100644
--- a/src/cmd_hmac_encrypt.rs
+++ b/src/cmd_hmac_encrypt.rs
@@ -13,7 +13,7 @@ impl Command for CommandImpl {
 
     fn subcommand<'a>(&self) -> App<'a, 'a> {
         SubCommand::with_name(self.name())
-            .about("Yubikey HMAC encrypt")
+            .about("YubiKey HMAC encrypt")
             .arg(
                 Arg::with_name("plaintext")
                     .long("plaintext")
diff --git a/src/cmd_piv_meta.rs b/src/cmd_piv_meta.rs
index 7389a5f..e9df05f 100644
--- a/src/cmd_piv_meta.rs
+++ b/src/cmd_piv_meta.rs
@@ -98,7 +98,7 @@ impl Command for CommandImpl {
                                 ssh_public_key.write_string(format!("nistp{}", ec_bit_len).as_bytes());
                                 ssh_public_key.write_string(pk_point_hex);
                                 let ssh_public_key_str = format!(
-                                    "ecdsa-sha2-nistp{} {} Yubikey-PIV-{}", ec_bit_len, base64_encode(ssh_public_key), slot_id);
+                                    "ecdsa-sha2-nistp{} {} YubiKey-PIV-{}", ec_bit_len, base64_encode(ssh_public_key), slot_id);
                                 json.insert("ssh_public_key", ssh_public_key_str.to_string());
                             }
                             _ => {}
diff --git a/src/cmd_ssh_pub_key.rs b/src/cmd_ssh_pub_key.rs
index c635ac4..0f51edf 100644
--- a/src/cmd_ssh_pub_key.rs
+++ b/src/cmd_ssh_pub_key.rs
@@ -105,7 +105,7 @@ impl Command for CommandImpl {
         eprintln!();
 
         let ssh_pub_key = format!(
-            "{}ecdsa-sha2-{} {} Yubikey-PIV-{}",
+            "{}ecdsa-sha2-{} {} YubiKey-PIV-{}",
             if ca {
                 "cert-authority,principals=\"root\" "
             } else {