diff --git a/src/cmd_pgpageaddress.rs b/src/cmd_pgp_age_address.rs
similarity index 100%
rename from src/cmd_pgpageaddress.rs
rename to src/cmd_pgp_age_address.rs
diff --git a/src/cmd_pgpcardadmin.rs b/src/cmd_pgp_card_admin.rs
similarity index 100%
rename from src/cmd_pgpcardadmin.rs
rename to src/cmd_pgp_card_admin.rs
diff --git a/src/cmd_pgpcarddecrypt.rs b/src/cmd_pgp_card_decrypt.rs
similarity index 100%
rename from src/cmd_pgpcarddecrypt.rs
rename to src/cmd_pgp_card_decrypt.rs
diff --git a/src/cmd_pgpcardlist.rs b/src/cmd_pgp_card_list.rs
similarity index 100%
rename from src/cmd_pgpcardlist.rs
rename to src/cmd_pgp_card_list.rs
diff --git a/src/cmd_pgpcardmake.rs b/src/cmd_pgp_card_make.rs
similarity index 100%
rename from src/cmd_pgpcardmake.rs
rename to src/cmd_pgp_card_make.rs
diff --git a/src/cmd_pgpcardsign.rs b/src/cmd_pgp_card_sign.rs
similarity index 100%
rename from src/cmd_pgpcardsign.rs
rename to src/cmd_pgp_card_sign.rs
diff --git a/src/main.rs b/src/main.rs
index 610317a..1c34e62 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,13 +14,13 @@ mod cmd_hmac_decrypt;
 mod cmd_list;
 #[cfg(feature = "with-sequoia-openpgp")]
 mod cmd_pgp;
-mod cmd_pgpageaddress;
-mod cmd_pgpcardadmin;
-mod cmd_pgpcarddecrypt;
-mod cmd_pgpcardlist;
+mod cmd_pgp_age_address;
+mod cmd_pgp_card_admin;
+mod cmd_pgp_card_decrypt;
+mod cmd_pgp_card_list;
 #[cfg(feature = "with-sequoia-openpgp")]
-mod cmd_pgpcardmake;
-mod cmd_pgpcardsign;
+mod cmd_pgp_card_make;
+mod cmd_pgp_card_sign;
 mod cmd_piv;
 mod cmd_piv_decrypt;
 mod cmd_piv_ecdh;
@@ -107,12 +107,12 @@ fn inner_main() -> CommandError {
         Box::new(cmd_rsa_verify::CommandImpl),
         #[cfg(feature = "with-sequoia-openpgp")]
         Box::new(cmd_pgp::CommandImpl),
-        Box::new(cmd_pgpcardadmin::CommandImpl),
-        Box::new(cmd_pgpcardlist::CommandImpl),
-        Box::new(cmd_pgpcardsign::CommandImpl),
-        Box::new(cmd_pgpcarddecrypt::CommandImpl),
+        Box::new(cmd_pgp_card_admin::CommandImpl),
+        Box::new(cmd_pgp_card_list::CommandImpl),
+        Box::new(cmd_pgp_card_sign::CommandImpl),
+        Box::new(cmd_pgp_card_decrypt::CommandImpl),
         #[cfg(feature = "with-sequoia-openpgp")]
-        Box::new(cmd_pgpcardmake::CommandImpl),
+        Box::new(cmd_pgp_card_make::CommandImpl),
         Box::new(cmd_piv::CommandImpl),
         Box::new(cmd_piv_summary::CommandImpl),
         Box::new(cmd_piv_meta::CommandImpl),
@@ -130,7 +130,7 @@ fn inner_main() -> CommandError {
         Box::new(cmd_ssh_piv_cert::CommandImpl),
         Box::new(cmd_ssh_pub_key::CommandImpl),
         Box::new(cmd_ssh_parse::CommandImpl),
-        Box::new(cmd_pgpageaddress::CommandImpl),
+        Box::new(cmd_pgp_age_address::CommandImpl),
         Box::new(cmd_sign_jwt::CommandImpl),
         Box::new(cmd_sign_jwt_soft::CommandImpl),
         Box::new(cmd_sign_jwt_se::CommandImpl),