diff --git a/Formula/a/ast-grep.rb b/Formula/a/ast-grep.rb
index c800607f04737..c0102033a3e27 100644
--- a/Formula/a/ast-grep.rb
+++ b/Formula/a/ast-grep.rb
@@ -21,7 +21,7 @@ def install
     system "cargo", "install", *std_cargo_args(path: "crates/cli")
 
     generate_completions_from_executable(bin/"ast-grep", "completions")
-    generate_completions_from_executable(bin/"sg", "completions", base_name: "sg")
+    generate_completions_from_executable(bin/"sg", "completions")
   end
 
   test do
diff --git a/Formula/b/bitwarden-cli.rb b/Formula/b/bitwarden-cli.rb
index 017d1e273656e..4ffc351b606b9 100644
--- a/Formula/b/bitwarden-cli.rb
+++ b/Formula/b/bitwarden-cli.rb
@@ -41,10 +41,7 @@ def install
     (node_modules/"argon2/prebuilds/linux-x64/argon2.musl.node").unlink
     (node_modules/"argon2/prebuilds").each_child { |dir| rm_r(dir) if dir.basename.to_s != "#{os}-#{arch}" }
 
-    generate_completions_from_executable(
-      bin/"bw", "completion",
-      base_name: "bw", shell_parameter_format: :arg, shells: [:zsh]
-    )
+    generate_completions_from_executable(bin/"bw", "completion", shells: [:zsh], shell_parameter_format: :arg)
   end
 
   test do
diff --git a/Formula/c/cartridge-cli.rb b/Formula/c/cartridge-cli.rb
index 2b08dc58e1735..4fa7a35535b84 100644
--- a/Formula/c/cartridge-cli.rb
+++ b/Formula/c/cartridge-cli.rb
@@ -24,9 +24,8 @@ def install
     system "mage", "build"
     bin.install "cartridge"
     generate_completions_from_executable(bin/"cartridge", "gen", "completion",
-                                            shells:                 [:bash, :zsh],
-                                            shell_parameter_format: :none,
-                                            base_name:              "cartridge")
+                                         shells:                 [:bash, :zsh],
+                                         shell_parameter_format: :none)
   end
 
   test do
diff --git a/Formula/c/chainloop-cli.rb b/Formula/c/chainloop-cli.rb
index a00416cf91551..1aa08c8168a95 100644
--- a/Formula/c/chainloop-cli.rb
+++ b/Formula/c/chainloop-cli.rb
@@ -25,7 +25,7 @@ def install
 
     system "go", "build", *std_go_args(ldflags:, output: bin/"chainloop"), "./app/cli"
 
-    generate_completions_from_executable(bin/"chainloop", "completion", base_name: "chainloop")
+    generate_completions_from_executable(bin/"chainloop", "completion")
   end
 
   test do
diff --git a/Formula/c/cilium-cli.rb b/Formula/c/cilium-cli.rb
index 3fc75880d661d..9b1a674bb6769 100644
--- a/Formula/c/cilium-cli.rb
+++ b/Formula/c/cilium-cli.rb
@@ -35,7 +35,7 @@ def install
     ]
     system "go", "build", *std_go_args(ldflags:, output: bin/"cilium"), "./cmd/cilium"
 
-    generate_completions_from_executable(bin/"cilium", "completion", base_name: "cilium")
+    generate_completions_from_executable(bin/"cilium", "completion")
   end
 
   test do
diff --git a/Formula/c/cloudformation-guard.rb b/Formula/c/cloudformation-guard.rb
index 9ff9529b16c67..c2ccb8871e035 100644
--- a/Formula/c/cloudformation-guard.rb
+++ b/Formula/c/cloudformation-guard.rb
@@ -20,7 +20,7 @@ class CloudformationGuard < Formula
   def install
     system "cargo", "install", *std_cargo_args(path: "guard")
 
-    generate_completions_from_executable(bin/"cfn-guard", "completions", "--shell", base_name: "cfn-guard")
+    generate_completions_from_executable(bin/"cfn-guard", "completions", "--shell")
 
     doc.install "docs"
     doc.install "guard-examples"
diff --git a/Formula/c/cocogitto.rb b/Formula/c/cocogitto.rb
index b3f81c0acd4f2..033fdac238706 100644
--- a/Formula/c/cocogitto.rb
+++ b/Formula/c/cocogitto.rb
@@ -31,7 +31,7 @@ def install
     ENV["LIBGIT2_NO_VENDOR"] = "1"
 
     system "cargo", "install", *std_cargo_args
-    generate_completions_from_executable(bin/"cog", "generate-completions", base_name: "cog")
+    generate_completions_from_executable(bin/"cog", "generate-completions")
 
     system bin/"cog", "generate-manpages", buildpath
     man1.install Dir["*.1"]
diff --git a/Formula/c/cri-tools.rb b/Formula/c/cri-tools.rb
index b23361524201f..478ed6954f20c 100644
--- a/Formula/c/cri-tools.rb
+++ b/Formula/c/cri-tools.rb
@@ -26,7 +26,7 @@ def install
       system "make", "install", "VERSION=#{version}"
     end
 
-    generate_completions_from_executable(bin/"crictl", "completion", base_name: "crictl")
+    generate_completions_from_executable(bin/"crictl", "completion")
   end
 
   test do
diff --git a/Formula/e/elan-init.rb b/Formula/e/elan-init.rb
index 48b23c173a034..1b7997a54372a 100644
--- a/Formula/e/elan-init.rb
+++ b/Formula/e/elan-init.rb
@@ -53,7 +53,7 @@ def install
       bin.install_symlink "elan-init" => link
     end
 
-    generate_completions_from_executable(bin/"elan", "completions", base_name: "elan")
+    generate_completions_from_executable(bin/"elan", "completions")
   end
 
   test do
diff --git a/Formula/f/fleet-cli.rb b/Formula/f/fleet-cli.rb
index 8fd56616353a0..c5d627d52204c 100644
--- a/Formula/f/fleet-cli.rb
+++ b/Formula/f/fleet-cli.rb
@@ -30,7 +30,7 @@ def install
     ]
     system "go", "build", *std_go_args(output: bin/"fleet", ldflags:), "./cmd/fleetcli"
 
-    generate_completions_from_executable(bin/"fleet", "completion", base_name: "fleet")
+    generate_completions_from_executable(bin/"fleet", "completion")
   end
 
   test do