diff --git a/Library/Homebrew/dev-cmd/create.rb b/Library/Homebrew/dev-cmd/create.rb
index d344b8255a4b68fdf81576a46211aa7a33cabc4f..05f7fce691c3622d8e294e0006f22946a1136534 100644
--- a/Library/Homebrew/dev-cmd/create.rb
+++ b/Library/Homebrew/dev-cmd/create.rb
@@ -23,8 +23,8 @@ module Homebrew
              description: "Create a basic template for an Autotools-style build."
       switch "--cmake",
              description: "Create a basic template for a CMake-style build."
-      switch "--go-mod",
-             description: "Create a basic template for a Go-Modules-style build."
+      switch "--go",
+             description: "Create a basic template for a Go build."
       switch "--meson",
              description: "Create a basic template for a Meson-style build."
       switch "--no-fetch",
@@ -42,7 +42,7 @@ module Homebrew
       switch :force
       switch :verbose
       switch :debug
-      conflicts "--autotools", "--cmake", "--go-mod", "--meson"
+      conflicts "--autotools", "--cmake", "--go", "--meson"
     end
   end
 
@@ -75,8 +75,8 @@ module Homebrew
       :autotools
     elsif args.meson?
       :meson
-    elsif args.go_mod?
-      :go_mod
+    elsif args.go?
+      :go
     end
 
     if fc.name.nil? || fc.name.strip.empty?
diff --git a/Library/Homebrew/formula_creator.rb b/Library/Homebrew/formula_creator.rb
index e4396658f6ef0952a7b1aaf2098b1f1daabc2de6..dbea710c5e2ea17c4006bbbd84f6ca6d4d103380 100644
--- a/Library/Homebrew/formula_creator.rb
+++ b/Library/Homebrew/formula_creator.rb
@@ -99,7 +99,7 @@ module Homebrew
 
         <% if mode == :cmake %>
           depends_on "cmake" => :build
-        <% elsif mode == :go_mod %>
+        <% elsif mode == :go %>
           depends_on "go" => :build
         <% elsif mode == :meson %>
           depends_on "meson" => :build
@@ -118,7 +118,7 @@ module Homebrew
                                   "--disable-dependency-tracking",
                                   "--disable-silent-rules",
                                   "--prefix=\#{prefix}"
-        <% elsif mode == :go_mod %>
+        <% elsif mode == :go %>
             system "go", "build", "-o", "\#{bin}/\#{name}"
         <% elsif mode == :meson %>
             mkdir "build" do
@@ -134,7 +134,7 @@ module Homebrew
                                   "--prefix=\#{prefix}"
             # system "cmake", ".", *std_cmake_args
         <% end %>
-        <% if mode != :meson and mode != :go_mod %>
+        <% if mode != :meson and mode != :go %>
             system "make", "install" # if this fails, try separate make/make install steps
         <% end %>
           end
diff --git a/docs/Manpage.md b/docs/Manpage.md
index f9aba122caa083b1d049d4d293031b1017651e43..165e32b18c81d686e7a173987261854bbc91a79b 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -801,8 +801,8 @@ a simple example. For the complete API, see:
   Create a basic template for an Autotools-style build.
 * `--cmake`:
   Create a basic template for a CMake-style build.
-* `--go-mod`:
-  Create a basic template for a Go-Modules-style build.
+* `--go`:
+  Create a basic template for a Go build.
 * `--meson`:
   Create a basic template for a Meson-style build.
 * `--no-fetch`:
diff --git a/manpages/brew.1 b/manpages/brew.1
index b3d626f3fb16297e35727182a7aea57fee73a6eb..d20766fdd9529465800bd13bff9c43a596cfcba9 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1020,8 +1020,8 @@ Create a basic template for an Autotools\-style build\.
 Create a basic template for a CMake\-style build\.
 .
 .TP
-\fB\-\-go\-mod\fR
-Create a basic template for a Go\-Modules\-style build\.
+\fB\-\-go\fR
+Create a basic template for a Go build\.
 .
 .TP
 \fB\-\-meson\fR