diff --git a/golem-cli/src/command/component.rs b/golem-cli/src/command/component.rs
index 2e515cc34..51d5351c8 100644
--- a/golem-cli/src/command/component.rs
+++ b/golem-cli/src/command/component.rs
@@ -87,7 +87,7 @@ pub enum ComponentSubCommand<
         #[arg(
             long,
             short,
-            conflicts_with_all = vec!["component-file", "component-type-flag"],
+            conflicts_with_all = vec!["component_file", "component_type"],
             verbatim_doc_comment
         )]
         app: Vec<PathBuf>,
diff --git a/golem-cli/src/model.rs b/golem-cli/src/model.rs
index f0d216c4a..1bb34a085 100644
--- a/golem-cli/src/model.rs
+++ b/golem-cli/src/model.rs
@@ -388,7 +388,7 @@ struct ComponentUriOrNamesArgs {
         short = 'C',
         long,
         value_name = "URI",
-        conflicts_with_all = vec!["component-name"],
+        conflicts_with_all = vec!["component_name"],
     )]
     component: Option<ComponentUri>,