diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 443739f8ce068505423acb85af739e51414f5159..20221524a442b51b41cb101159f8146a89580716 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -100,10 +100,8 @@ module Homebrew
     raise SEARCH_ERROR_QUEUE.pop unless SEARCH_ERROR_QUEUE.empty?
   end
 
-  SEARCHABLE_TAPS = OFFICIAL_TAPS.map { |tap| ["Homebrew", tap] } + [
-    %w[Caskroom cask],
-    %w[Caskroom versions],
-  ]
+  SEARCHABLE_TAPS = OFFICIAL_TAPS.map { |tap| ["Homebrew", tap] } +
+                    OFFICIAL_CASK_TAPS.map { |tap| ["caskroom", tap] }
 
   def query_regexp(query)
     case query
@@ -126,7 +124,7 @@ module Homebrew
     regex = regex_or_string.is_a?(String) ? /^#{Regexp.escape(regex_or_string)}$/ : regex_or_string
 
     if (HOMEBREW_LIBRARY/"Taps/#{user.downcase}/homebrew-#{repo.downcase}").directory? && \
-       user != "Caskroom"
+       user != "caskroom"
       return []
     end
 
diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb
index a7bc4a1d60c7a3679e4c15d1b5e712d2eb344968..e069e5265e787b883c9f82d62557f350153a97df 100644
--- a/Library/Homebrew/official_taps.rb
+++ b/Library/Homebrew/official_taps.rb
@@ -5,6 +5,11 @@ OFFICIAL_TAPS = %w[
   science
 ].freeze
 
+OFFICIAL_CASK_TAPS = %w[
+  cask
+  versions
+].freeze
+
 OFFICIAL_CMD_TAPS = {
   "homebrew/bundle" => ["bundle"],
   "homebrew/test-bot" => ["test-bot"],