diff --git a/src/cmd_register.rs b/src/cmd_u2fregister.rs
similarity index 100%
rename from src/cmd_register.rs
rename to src/cmd_u2fregister.rs
diff --git a/src/cmd_sign.rs b/src/cmd_u2fsign.rs
similarity index 100%
rename from src/cmd_sign.rs
rename to src/cmd_u2fsign.rs
diff --git a/src/main.rs b/src/main.rs
index a3fdf9d..1350d65 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,8 +6,8 @@ use rust_util::util_clap::{Command, CommandError};
 
 mod fido;
 mod digest;
-mod cmd_register;
-mod cmd_sign;
+mod cmd_u2fregister;
+mod cmd_u2fsign;
 mod cmd_pgp;
 mod pgpcardutil;
 mod cmd_pgpcardlist;
@@ -38,16 +38,16 @@ fn main() {
 
 fn inner_main() -> CommandError {
     let commands: Vec<Box<dyn Command>> = vec![
-        Box::new(cmd_register::CommandImpl),
-        Box::new(cmd_sign::CommandImpl),
+        Box::new(cmd_chall::CommandImpl),
+        Box::new(cmd_challconfig::CommandImpl),
         Box::new(cmd_pgp::CommandImpl),
         Box::new(cmd_pgpcardlist::CommandImpl),
         Box::new(cmd_pgpcardsign::CommandImpl),
         Box::new(cmd_pgpcarddecrypt::CommandImpl),
         Box::new(cmd_piv::CommandImpl),
         Box::new(cmd_pivsign::CommandImpl),
-        Box::new(cmd_chall::CommandImpl),
-        Box::new(cmd_challconfig::CommandImpl),
+        Box::new(cmd_u2fregister::CommandImpl),
+        Box::new(cmd_u2fsign::CommandImpl),
     ];
     let mut app = App::new(env!("CARGO_PKG_NAME"))
         .version(env!("CARGO_PKG_VERSION"))