diff --git a/Library/Homebrew/extend/os/mac/utils/bottles.rb b/Library/Homebrew/extend/os/mac/utils/bottles.rb
index 4b93867887..1b9303918f 100644
--- a/Library/Homebrew/extend/os/mac/utils/bottles.rb
+++ b/Library/Homebrew/extend/os/mac/utils/bottles.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Utils
-  class Bottles
+  module Bottles
     class << self
       undef tag
 
diff --git a/Library/Homebrew/sorbet/rbi/utils/utils.rbi b/Library/Homebrew/sorbet/rbi/utils/utils.rbi
index f09ceb3b20..db9dd1a59b 100644
--- a/Library/Homebrew/sorbet/rbi/utils/utils.rbi
+++ b/Library/Homebrew/sorbet/rbi/utils/utils.rbi
@@ -3,7 +3,7 @@
 module Utils
   include Kernel
 
-  class Bottles
+  module Bottles
   end
 
   module Link
diff --git a/Library/Homebrew/utils/bottles.rb b/Library/Homebrew/utils/bottles.rb
index 250cb00126..b5cafd9ac9 100644
--- a/Library/Homebrew/utils/bottles.rb
+++ b/Library/Homebrew/utils/bottles.rb
@@ -3,7 +3,10 @@
 require "tab"
 
 module Utils
-  class Bottles
+  # Helper functions for bottles.
+  #
+  # @api private
+  module Bottles
     class << self
       def tag
         @tag ||= "#{ENV["HOMEBREW_PROCESSOR"]}_#{ENV["HOMEBREW_SYSTEM"]}".downcase.to_sym
@@ -69,7 +72,8 @@ module Utils
       end
     end
 
-    class Bintray
+    # Helper functions for bottles hosted on Bintray.
+    module Bintray
       def self.package(formula_name)
         package_name = formula_name.to_s.dup
         package_name.tr!("+", "x")
@@ -86,6 +90,7 @@ module Utils
       end
     end
 
+    # Collector for bottles specifications.
     class Collector
       extend Forwardable