diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 443739f8ce068505423acb85af739e51414f5159..a5d4d0fca410844536a7cb2baa4dd24aafe98b95 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -101,8 +101,8 @@ module Homebrew
   end
 
   SEARCHABLE_TAPS = OFFICIAL_TAPS.map { |tap| ["Homebrew", tap] } + [
-    %w[Caskroom cask],
-    %w[Caskroom versions],
+    %w[caskroom cask],
+    %w[caskroom versions],
   ]
 
   def query_regexp(query)
@@ -126,7 +126,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