diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb
index 44fb542503..c265035f5c 100644
--- a/Library/Homebrew/official_taps.rb
+++ b/Library/Homebrew/official_taps.rb
@@ -14,6 +14,7 @@ OFFICIAL_CMD_TAPS = {
 DEPRECATED_OFFICIAL_TAPS = %w[
   apache
   binary
+  cask-eid
   completions
   devel-only
   dupes
diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index f9f6779210..1138cf6149 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -234,9 +234,10 @@ class Tap
     require "descriptions"
 
     if official? && DEPRECATED_OFFICIAL_TAPS.include?(repo)
-      odie "#{name} was deprecated. This tap is now empty as all its formulae were migrated."
+      odie "#{name} was deprecated. This tap is now empty and all its contents were either deleted or migrated."
     elsif user == "caskroom"
-      odie "#{name} was moved. Tap homebrew/cask-#{repo} instead."
+      new_repo = repo == "cask" ? "cask" : "cask-#{repo}"
+      odie "#{name} was moved. Tap homebrew/#{new_repo} instead."
     end
 
     requested_remote = clone_target || default_remote