diff --git a/src/config.rs b/src/config.rs
index 0ed803e..12f54ef 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -85,7 +85,7 @@ impl Config {
             rule.add_label(l);
         }
         if delete {
-            rule.set_command(&EolAction::Delete);
+            rule.set_action(&EolAction::Delete);
         }
         log::info!("added rule: {rule}");
         self.rules.insert(rule.id().to_string(), rule);
@@ -178,7 +178,7 @@ impl Config {
         let Some(rule) = self.rules.get_mut(id.to_string().as_str()) else {
             return Err(Error::RuleNotFound(id));
         };
-        rule.set_command(action);
+        rule.set_action(action);
         self.save()?;
         println!("Action set to `{action}` on rule `#{id}`");
 
diff --git a/src/config/eol_rule.rs b/src/config/eol_rule.rs
index 7e41542..dad83f8 100644
--- a/src/config/eol_rule.rs
+++ b/src/config/eol_rule.rs
@@ -92,7 +92,7 @@ impl EolRule {
         self.labels.iter().map(|i| i.to_string()).collect()
     }
 
-    pub(crate) fn set_command(&mut self, value: &EolAction) -> &mut Self {
+    pub(crate) fn set_action(&mut self, value: &EolAction) -> &mut Self {
         self.action = value.to_string();
         self
     }
diff --git a/src/config_cli.rs b/src/config_cli.rs
index d56a78c..c022036 100644
--- a/src/config_cli.rs
+++ b/src/config_cli.rs
@@ -10,7 +10,7 @@ use label_cli::LabelCli;
 use rules_cli::RulesCli;
 
 #[derive(Subcommand, Debug)]
-enum Commands {
+enum SubCmds {
     /// Configure end-of-life rules
     #[clap(name = "rules")]
     Rules(RulesCli),
@@ -27,15 +27,15 @@ pub struct ConfigCli {
     #[clap(flatten)]
     logging: clap_verbosity_flag::Verbosity,
     #[command(subcommand)]
-    command: Commands,
+    sub_command: SubCmds,
 }
 
 impl ConfigCli {
     pub fn run(&self, config: Config) -> Result<()> {
-        match &self.command {
-            Commands::Rules(rules_cli) => rules_cli.run(config),
-            Commands::Label(label_cli) => label_cli.run(config),
-            Commands::Action(action_cli) => action_cli.run(config),
+        match &self.sub_command {
+            SubCmds::Rules(rules_cli) => rules_cli.run(config),
+            SubCmds::Label(label_cli) => label_cli.run(config),
+            SubCmds::Action(action_cli) => action_cli.run(config),
         }
     }
 }
diff --git a/src/eol_action.rs b/src/eol_action.rs
index 1e906c9..e90bd74 100644
--- a/src/eol_action.rs
+++ b/src/eol_action.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-/// End of life command
+/// End of life action
 /// - Trash - move the message to the trash to be automatically deleted by Google
 /// - Delete - delete the message immediately without allowing rescue from trash
 #[derive(Debug, Default)]
diff --git a/src/main.rs b/src/main.rs
index b3e4722..c79f730 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,11 +20,11 @@ struct Cli {
     #[clap(flatten)]
     logging: clap_verbosity_flag::Verbosity,
     #[command(subcommand)]
-    command: Option<Commands>,
+    sub_command: Option<SubCmds>,
 }
 
 #[derive(Subcommand, Debug)]
-enum Commands {
+enum SubCmds {
     /// List messages
     #[clap(name = "message")]
     Message(MessageCli),
@@ -65,12 +65,12 @@ async fn main() {
 async fn run(args: Cli) -> Result<(), Error> {
     let config = get_config()?;
     log::trace!("Configuration loaded: {config:#?}");
-    if let Some(cmds) = args.command {
+    if let Some(cmds) = args.sub_command {
         match cmds {
-            Commands::Message(list_cli) => list_cli.run(config.credential_file()).await?,
-            Commands::Labels(label_cli) => label_cli.run(config.credential_file()).await?,
-            Commands::Trash(trash_cli) => trash_cli.run(config.credential_file()).await?,
-            Commands::Config(config_cli) => config_cli.run(config)?,
+            SubCmds::Message(list_cli) => list_cli.run(config.credential_file()).await?,
+            SubCmds::Labels(label_cli) => label_cli.run(config.credential_file()).await?,
+            SubCmds::Trash(trash_cli) => trash_cli.run(config.credential_file()).await?,
+            SubCmds::Config(config_cli) => config_cli.run(config)?,
         }
     }
     Ok(())